From 9b6bf20fab17b29d3f8b63d3db1cac285ca1d8be Mon Sep 17 00:00:00 2001
From: alexiscatnip <alexiscatnip@gmail.com>
Date: Sat, 30 Jul 2022 01:19:50 +0800
Subject: [PATCH] refactor: RDI is now a singleton.. again.

---
 Assets/AnimateStandPrototype.cs               |  2 +-
 Assets/LogoutButton.cs                        | 22 -----------
 Assets/Raindrop/Bootstrap/PersistenceLayer.cs |  2 +-
 .../Bootstrap/RaindropBootstrapper.cs         | 18 +--------
 Assets/Raindrop/Bootstrap/UIBootstrapper.cs   |  2 +-
 .../RaindropCinemachineAssignLookAtAvatar.cs  |  2 +-
 .../Camera/RaindropMainCameraDrawDistance.cs  | 37 ++++++++++++++++++
 .../RaindropMainCameraDrawDistance.cs.meta    |  0
 .../Raindrop/Connectivity/connectivityUI.cs   |  2 +-
 .../Controls/DisableUI_IfNotFullyConnected.cs |  2 +-
 .../JoystickCameraRelativeCharacterControl.cs |  2 +-
 .../Raindrop/Controls/JumpButton_ToBackend.cs |  2 +-
 Assets/Raindrop/Controls/PlayerFacingInput.cs |  2 +-
 Assets/Raindrop/Core/GestureManager.cs        |  8 ++--
 Assets/Raindrop/Core/LoginUtils.cs            |  2 +-
 Assets/Raindrop/Core/SlUriParser.cs           | 16 ++++----
 Assets/Raindrop/RaindropInstance.cs           |  7 +++-
 Assets/Raindrop/Render/ObjectManager.cs       |  2 +-
 Assets/Raindrop/Render/RenderingHelpers.cs    |  8 ++--
 .../UI/AvatarInfo/AvatarInfoPresenter.cs      |  2 +-
 .../UI/CanvasHelpers/ScreenStackManager.cs    |  2 +-
 ...gleInteractivityBasedOnConnectionStatus.cs |  2 +-
 Assets/Raindrop/UI/EULA/EulaView.cs           |  2 +-
 Assets/Raindrop/UI/Game/GamePresenter.cs      |  2 +-
 .../GridSelection/GridSelectionController.cs  |  2 +-
 .../Raindrop/UI/Image/Texturable_RawImage.cs  |  2 +-
 .../UI/LoadingScreen/LoadingController.cs     |  2 +-
 Assets/Raindrop/UI/Login/GridNameView.cs      |  2 +-
 Assets/Raindrop/UI/Login/LoginController.cs   |  2 +-
 Assets/Raindrop/UI/Login/LoginPresenter.cs    |  2 +-
 Assets/Raindrop/UI/LogoutButton.cs            | 23 +++++++++++
 Assets/{ => Raindrop/UI}/LogoutButton.cs.meta |  0
 .../UI/Map/LandmarkCard/LandmarkController.cs |  2 +-
 .../Raindrop/UI/Map/MapService/MapService.cs  |  2 +-
 .../UI/Map/MapService/MapTilesNetwork.cs      |  2 +-
 .../Map_SceneHierachy/MapScenePresenter.cs    |  2 +-
 Assets/Raindrop/UI/Map/UI/MapUIView.cs        |  2 +-
 Assets/Raindrop/UI/Map/UI/ParcelInfoPopup.cs  |  2 +-
 .../Raindrop/UI/Notification/ModalsManager.cs |  2 +-
 Assets/Raindrop/UI/Notification/ntfGeneric.cs |  2 +-
 Assets/Raindrop/UI/People/PeopleView.cs       |  2 +-
 Assets/Raindrop/UI/Sound/ButtonSound.cs       |  2 +-
 Assets/Raindrop/UI/UpdateCameraBackend.cs     |  2 +-
 Assets/Raindrop/UI/UpdateMovementBackend.cs   |  2 +-
 Assets/Raindrop/UI/chat/AddAChatView.cs       |  2 +-
 .../UI/chat/ChatBox/ChatInputPresenter.cs     |  2 +-
 .../UI/chat/ChatBox/IMChat/IMPresenter.cs     |  2 +-
 .../ChatBox/LocalChat/LocalChatPresenter.cs   |  2 +-
 .../UI/chat/ChatMainWindow/ChatManager.cs     |  2 +-
 .../UI/chat/ChatMainWindow/ChatPresenter.cs   |  2 +-
 Assets/Raindrop/UI/testing/prim_testrunner.cs |  2 +-
 Assets/Raindrop/Unity3D/AgentPresenter.cs     |  2 +-
 .../Unity3D/MapPlayerLocationUpdater.cs       |  2 +-
 .../ObjectsRendering/TerrainMeshController.cs |  2 +-
 .../ObjectsRendering/TerrainMeshingDriver.cs  |  2 +-
 .../Raindrop/WorldOrigin/Origin_SimHandle.cs  |  2 +-
 Assets/RaindropMainCameraDrawDistance.cs      | 38 -------------------
 Assets/ResetMinimapCamera.cs                  |  2 +-
 .../EulaAcceptanceTests.cs                    |  2 +-
 .../LocalChatTests.cs                         |  2 +-
 .../LoginTests.cs                             |  2 +-
 .../SoundTests.cs                             |  4 +-
 .../GridSelectorTests/GridSelectorTests.cs    |  2 +-
 .../Helpers/SceneLoader.cs                    |  2 +-
 64 files changed, 137 insertions(+), 148 deletions(-)
 delete mode 100644 Assets/LogoutButton.cs
 create mode 100644 Assets/Raindrop/Camera/RaindropMainCameraDrawDistance.cs
 rename Assets/{ => Raindrop/Camera}/RaindropMainCameraDrawDistance.cs.meta (100%)
 create mode 100644 Assets/Raindrop/UI/LogoutButton.cs
 rename Assets/{ => Raindrop/UI}/LogoutButton.cs.meta (100%)
 delete mode 100644 Assets/RaindropMainCameraDrawDistance.cs

diff --git a/Assets/AnimateStandPrototype.cs b/Assets/AnimateStandPrototype.cs
index 05fff46..297ee91 100644
--- a/Assets/AnimateStandPrototype.cs
+++ b/Assets/AnimateStandPrototype.cs
@@ -11,7 +11,7 @@ using Logger = OpenMetaverse.Logger;
 //make the avatar play the standing animation.
 public class AnimateStandPrototype : MonoBehaviour
 {
-    private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    private RaindropInstance instance => RaindropInstance.GlobalInstance;
 
     public UUID standAnim => Animations.STAND;
     public UUID anim => standAnim;
diff --git a/Assets/LogoutButton.cs b/Assets/LogoutButton.cs
deleted file mode 100644
index ebd1bb5..0000000
--- a/Assets/LogoutButton.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Plugins.CommonDependencies;
-using Raindrop;
-using UnityEngine;
-using UnityEngine.UI;
-
-[RequireComponent(typeof(Button))]
-public class LogoutButton : MonoBehaviour
-{
-    //get own references.
-    void Awake()
-    {
-        Button btn = this.GetComponent<Button>();
-        btn.onClick.AddListener(Logout);
-    }
-
-    private void Logout()
-    {
-        Debug.Log("logout requested by user UI");
-        ServiceLocator.Instance.Get<RaindropInstance>().Netcom.Logout();
-    }
-    
-}
diff --git a/Assets/Raindrop/Bootstrap/PersistenceLayer.cs b/Assets/Raindrop/Bootstrap/PersistenceLayer.cs
index c7c48a2..9746e47 100644
--- a/Assets/Raindrop/Bootstrap/PersistenceLayer.cs
+++ b/Assets/Raindrop/Bootstrap/PersistenceLayer.cs
@@ -23,7 +23,7 @@ namespace Raindrop.Bootstrap
         {
             var ui = ServiceLocator.Instance.Get<UIService>();
             Assert.IsNotNull(ui, "ui is not found.");
-            // var instance = ServiceLocator.ServiceLocator.Instance.Get<RaindropInstance>();
+            // var instance = ServiceLocator.RaindropInstance.GlobalInstance;
             // ui.modalManager.showModal_NtfGeneric("Quick Re-log",
             //     "Would you like to login with previous credentials: \n" +
             //     instance.GlobalSettings["a"]
diff --git a/Assets/Raindrop/Bootstrap/RaindropBootstrapper.cs b/Assets/Raindrop/Bootstrap/RaindropBootstrapper.cs
index 78046da..47f28f7 100644
--- a/Assets/Raindrop/Bootstrap/RaindropBootstrapper.cs
+++ b/Assets/Raindrop/Bootstrap/RaindropBootstrapper.cs
@@ -125,11 +125,7 @@ namespace Raindrop.Bootstrap
 
         public static void CreateAndRegister_RaindropInstance()
         {
-            if (ServiceLocator.Instance.IsRegistered<RaindropInstance>()) 
-                return;
-            
-            var rdi = new RaindropInstance(new GridClient());
-            ServiceLocator.Instance.Register<RaindropInstance>(rdi);
+            var instance = RaindropInstance.GlobalInstance;
             SendStartupMessageToLogger();
         }
 
@@ -164,7 +160,7 @@ namespace Raindrop.Bootstrap
             RaindropInstance instance;
             try
             {
-                instance = ServiceLocator.Instance.Get<RaindropInstance>();
+                instance = RaindropInstance.GlobalInstance;
             }
             catch
             {
@@ -190,8 +186,6 @@ namespace Raindrop.Bootstrap
 
             frmMain_Disposed(instance);
 
-            Unregister_RaindropInstance();
-            
             Debug.Log("disposed netcom and client! :) This marks the end of the app.");
         }
 
@@ -218,14 +212,6 @@ namespace Raindrop.Bootstrap
 
             instance.CleanUp();
         }
-        
-        public static void Unregister_RaindropInstance()
-        {
-            if (ServiceLocator.Instance.IsRegistered<RaindropInstance>())
-            {
-                ServiceLocator.Instance.Unregister<RaindropInstance>();
-            }
-        }
         #endregion
 
     }
diff --git a/Assets/Raindrop/Bootstrap/UIBootstrapper.cs b/Assets/Raindrop/Bootstrap/UIBootstrapper.cs
index 011c89c..9726833 100644
--- a/Assets/Raindrop/Bootstrap/UIBootstrapper.cs
+++ b/Assets/Raindrop/Bootstrap/UIBootstrapper.cs
@@ -11,7 +11,7 @@ namespace Raindrop.Bootstrap
     // link all the UI together
     class UIBootstrapper : MonoBehaviour
     {
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
         private RaindropNetcom netcom => instance.Netcom;
 
         [SerializeField] public References references;
diff --git a/Assets/Raindrop/Camera/RaindropCinemachineAssignLookAtAvatar.cs b/Assets/Raindrop/Camera/RaindropCinemachineAssignLookAtAvatar.cs
index faf5783..216d415 100644
--- a/Assets/Raindrop/Camera/RaindropCinemachineAssignLookAtAvatar.cs
+++ b/Assets/Raindrop/Camera/RaindropCinemachineAssignLookAtAvatar.cs
@@ -7,7 +7,7 @@ namespace Raindrop.Camera
 {
     public class RaindropCinemachineAssignLookAtAvatar : MonoBehaviour
     {
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         //private RaindropNetcom netcom { get { return instance.Netcom; } }
         bool Active => instance.Client.Network.Connected;
 
diff --git a/Assets/Raindrop/Camera/RaindropMainCameraDrawDistance.cs b/Assets/Raindrop/Camera/RaindropMainCameraDrawDistance.cs
new file mode 100644
index 0000000..6b9e0ce
--- /dev/null
+++ b/Assets/Raindrop/Camera/RaindropMainCameraDrawDistance.cs
@@ -0,0 +1,37 @@
+using OpenMetaverse;
+using Plugins.CommonDependencies;
+using UnityEngine;
+
+namespace Raindrop.Camera
+{
+    [RequireComponent(typeof(UnityEngine.Camera))]
+    public class RaindropMainCameraDrawDistance : MonoBehaviour
+    {
+        public float DrawDistance;
+        // private UIService ui => ServiceLocator.Instance.Get<UIService>();
+        private RaindropInstance Instance => RaindropInstance.GlobalInstance;
+        private GridClient Client => Instance.Client;
+
+        //private bool Active => ui.ScreensManager.TopCanvas.canvasType == CanvasType.Game;
+
+        // Start is called before the first frame update
+        void Start()
+        {
+            if (!Instance.GlobalSettings.ContainsKey("draw_distance"))
+            {
+                Instance.GlobalSettings["draw_distance"] = DrawDistance;
+            }
+
+            this.GetComponent<UnityEngine.Camera>().farClipPlane = DrawDistance;
+        }
+
+        void Update()
+        {
+            //if (!Active)
+            //{
+            //    return;
+            //}
+
+        }
+    }
+}
diff --git a/Assets/RaindropMainCameraDrawDistance.cs.meta b/Assets/Raindrop/Camera/RaindropMainCameraDrawDistance.cs.meta
similarity index 100%
rename from Assets/RaindropMainCameraDrawDistance.cs.meta
rename to Assets/Raindrop/Camera/RaindropMainCameraDrawDistance.cs.meta
diff --git a/Assets/Raindrop/Connectivity/connectivityUI.cs b/Assets/Raindrop/Connectivity/connectivityUI.cs
index b596d96..444c7a8 100644
--- a/Assets/Raindrop/Connectivity/connectivityUI.cs
+++ b/Assets/Raindrop/Connectivity/connectivityUI.cs
@@ -14,7 +14,7 @@ using Logger = OpenMetaverse.Logger;
 [RequireComponent(typeof(Image))]
 public class connectivityUI : MonoBehaviour
 {
-    private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    private RaindropInstance instance => RaindropInstance.GlobalInstance;
     
     void Start()
     {
diff --git a/Assets/Raindrop/Controls/DisableUI_IfNotFullyConnected.cs b/Assets/Raindrop/Controls/DisableUI_IfNotFullyConnected.cs
index a2f96fe..f1b588c 100644
--- a/Assets/Raindrop/Controls/DisableUI_IfNotFullyConnected.cs
+++ b/Assets/Raindrop/Controls/DisableUI_IfNotFullyConnected.cs
@@ -17,7 +17,7 @@ namespace Assets.Raindrop.UI.Movement
     {
         private Selectable btn;
 
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         //can the component run?
         bool CanSendCommandsToSimulator => instance.Client.Network.Connected && 
                                   !instance.Netcom.IsTeleporting &&
diff --git a/Assets/Raindrop/Controls/JoystickCameraRelativeCharacterControl.cs b/Assets/Raindrop/Controls/JoystickCameraRelativeCharacterControl.cs
index dcdab12..0104eb9 100644
--- a/Assets/Raindrop/Controls/JoystickCameraRelativeCharacterControl.cs
+++ b/Assets/Raindrop/Controls/JoystickCameraRelativeCharacterControl.cs
@@ -26,7 +26,7 @@ public class JoystickCameraRelativeCharacterControl : MonoBehaviour
     public AgentPresenter agents;
     public bool debug;
 
-    private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+    private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
     //private RaindropNetcom netcom { get { return instance.Netcom; } }
     bool Active => instance.Client.Network.Connected;
 
diff --git a/Assets/Raindrop/Controls/JumpButton_ToBackend.cs b/Assets/Raindrop/Controls/JumpButton_ToBackend.cs
index a9e2648..bcf8dee 100644
--- a/Assets/Raindrop/Controls/JumpButton_ToBackend.cs
+++ b/Assets/Raindrop/Controls/JumpButton_ToBackend.cs
@@ -13,7 +13,7 @@ namespace Assets.Raindrop.UI.Movement
     {
         public Button btn;
 
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
 
         public void OnPointerDown(PointerEventData eventData)
         {
diff --git a/Assets/Raindrop/Controls/PlayerFacingInput.cs b/Assets/Raindrop/Controls/PlayerFacingInput.cs
index ad79abc..fb0a2ff 100644
--- a/Assets/Raindrop/Controls/PlayerFacingInput.cs
+++ b/Assets/Raindrop/Controls/PlayerFacingInput.cs
@@ -12,7 +12,7 @@ using OMV = OpenMetaverse;
 // we can send it in a lerp-y way, as we slowly turn in the scene.
 public class PlayerFacingInput : MonoBehaviour
 {
-    private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+    private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
     private RaindropNetcom netcom { get { return instance.Netcom; } }
     private GridClient client { get { return instance.Client; } }
     bool Active => instance.Client.Network.Connected;
diff --git a/Assets/Raindrop/Core/GestureManager.cs b/Assets/Raindrop/Core/GestureManager.cs
index a31009e..07477bc 100644
--- a/Assets/Raindrop/Core/GestureManager.cs
+++ b/Assets/Raindrop/Core/GestureManager.cs
@@ -47,7 +47,7 @@ namespace Raindrop.Core
         /// </summary>
         public void BeginMonitoring()
         {
-            var client = ServiceLocator.Instance.Get<RaindropInstance>().Client;
+            var client = RaindropInstance.GlobalInstance.Client;
             client.Inventory.Store.InventoryObjectAdded += Store_InventoryObjectAdded;
             client.Inventory.Store.InventoryObjectUpdated += Store_InventoryObjectUpdated;
 
@@ -68,7 +68,7 @@ namespace Raindrop.Core
         /// </summary>
         public void StopMonitoring()
         {
-            var client = ServiceLocator.Instance.Get<RaindropInstance>().Client;
+            var client = RaindropInstance.GlobalInstance.Client;
             client.Inventory.Store.InventoryObjectAdded -= Store_InventoryObjectAdded;
             client.Inventory.Store.InventoryObjectUpdated -= Store_InventoryObjectUpdated;
         }
@@ -115,7 +115,7 @@ namespace Raindrop.Core
         private bool ProcessWord(string word, StringBuilder outString)
         {
             var possibleTriggers = new List<GestureTrigger>();
-            var client = ServiceLocator.Instance.Get<RaindropInstance>().Client;
+            var client = RaindropInstance.GlobalInstance.Client;
             var lowerWord = word.ToLower();
 
             client.Self.ActiveGestures.ForEach(pair =>
@@ -170,7 +170,7 @@ namespace Raindrop.Core
         /// <param name="gesture">Gesture that was added or updated.</param>
         private void UpdateInventoryGesture(InventoryGesture gesture)
         {
-            var client = ServiceLocator.Instance.Get<RaindropInstance>().Client;
+            var client = RaindropInstance.GlobalInstance.Client;
 
             client.Assets.RequestAsset(gesture.AssetUUID, AssetType.Gesture, false, (_, asset) =>
             {
diff --git a/Assets/Raindrop/Core/LoginUtils.cs b/Assets/Raindrop/Core/LoginUtils.cs
index 32dc6de..cee43bf 100644
--- a/Assets/Raindrop/Core/LoginUtils.cs
+++ b/Assets/Raindrop/Core/LoginUtils.cs
@@ -59,7 +59,7 @@ namespace Raindrop
 
             public override string ToString()
             {
-                RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+                RaindropInstance instance = RaindropInstance.GlobalInstance;
                 string gridName;
                 if (GridID == "custom_login_uri")
                 {
diff --git a/Assets/Raindrop/Core/SlUriParser.cs b/Assets/Raindrop/Core/SlUriParser.cs
index 83daf70..7c9082b 100644
--- a/Assets/Raindrop/Core/SlUriParser.cs
+++ b/Assets/Raindrop/Core/SlUriParser.cs
@@ -100,7 +100,7 @@ namespace Raindrop
         /// <returns>Display text for URI</returns>
         public string GetLinkName(string uri)
         {
-            if (!ServiceLocator.Instance.Get<RaindropInstance>().GlobalSettings["resolve_uris"])
+            if (!RaindropInstance.GlobalInstance.GlobalSettings["resolve_uris"])
             {
                 return uri;
             }
@@ -263,7 +263,7 @@ namespace Raindrop
         /// <returns>Name of agent on success, INCOMPLETE_NAME on failure or timeout</returns>
         private string GetAgentName(UUID agentID, ResolveType nameType)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
             string name = RaindropInstance.IncompleteName;
 
             using (ManualResetEvent gotName = new ManualResetEvent(false))
@@ -319,7 +319,7 @@ namespace Raindrop
         /// <returns>Name of the group on success, INCOMPLETE_NAME on failure or timeout</returns>
         private string GetGroupName(UUID groupID)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
             string name = RaindropInstance.IncompleteName;
 
             using (ManualResetEvent gotName = new ManualResetEvent(false))
@@ -357,7 +357,7 @@ namespace Raindrop
         /// <returns>Name of the parcel on success, INCOMPLETE_NAME on failure or timeout</returns>
         private string GetParcelName(UUID parcelID)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
             string name = RaindropInstance.IncompleteName;
             
             using (ManualResetEvent gotName = new ManualResetEvent(false))
@@ -630,7 +630,7 @@ namespace Raindrop
         #region Link Execution
         private void ExecuteLinkRegionUri(Match match)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
 
             string name = HttpUtility.UrlDecode(match.Groups["region_name"].Value);
             int x = match.Groups["local_x"].Success ? int.Parse(match.Groups["local_x"].Value) : 128;
@@ -644,7 +644,7 @@ namespace Raindrop
 
         private void ExecuteLinkAgent(Match match)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
             UUID agentID = new UUID(match.Groups["agent_id"].Value);
             //string action = match.Groups["action"].Value;
 
@@ -680,7 +680,7 @@ namespace Raindrop
 
         private void ExecuteLinkGroup(Match match)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
             string action = match.Groups["action"].Value;
 
             switch (action)
@@ -762,7 +762,7 @@ namespace Raindrop
 
         private void ExecuteLinkWorldMap(Match match)
         {
-            RaindropInstance instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance instance = RaindropInstance.GlobalInstance;
 
             string name = HttpUtility.UrlDecode(match.Groups["region_name"].Value);
             int x = match.Groups["local_x"].Success ? int.Parse(match.Groups["local_x"].Value) : 128;
diff --git a/Assets/Raindrop/RaindropInstance.cs b/Assets/Raindrop/RaindropInstance.cs
index ff21a72..9d5555d 100644
--- a/Assets/Raindrop/RaindropInstance.cs
+++ b/Assets/Raindrop/RaindropInstance.cs
@@ -17,9 +17,12 @@ using Logger = OpenMetaverse.Logger;
 namespace Raindrop
 {
     // The singleton instance of the game client.
-    public class RaindropInstance : IGameService
+    public class RaindropInstance
     {
-        //composition of many things...
+        // Singleton, there can be only one instance
+        private static RaindropInstance globalInstance = null;
+        public static RaindropInstance GlobalInstance => 
+            globalInstance ??= new RaindropInstance(new GridClient());
         
         private GridClient _client; //backend monolith API
         private RaindropNetcom _netcom;
diff --git a/Assets/Raindrop/Render/ObjectManager.cs b/Assets/Raindrop/Render/ObjectManager.cs
index 02e36a8..ad5b3d9 100644
--- a/Assets/Raindrop/Render/ObjectManager.cs
+++ b/Assets/Raindrop/Render/ObjectManager.cs
@@ -46,7 +46,7 @@ namespace Raindrop.Presenters
         // a cache for decoded scuplties
         Dictionary<UUID, Texture2D> sculptCache = new Dictionary<UUID, Texture2D>();
 
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private GridClient Client { get { return instance?.Client; } }
         bool Active => instance.Client.Network.Connected;
         
diff --git a/Assets/Raindrop/Render/RenderingHelpers.cs b/Assets/Raindrop/Render/RenderingHelpers.cs
index 8de843c..3e7ed9f 100644
--- a/Assets/Raindrop/Render/RenderingHelpers.cs
+++ b/Assets/Raindrop/Render/RenderingHelpers.cs
@@ -166,7 +166,7 @@ namespace Raindrop.Rendering
             if (BasePrim.Velocity != Vector3.Zero)
             {
                 BasePrim.Position = InterpolatedPosition = BasePrim.Position + BasePrim.Velocity * time
-                    * 0.98f * ServiceLocator.Instance.Get<RaindropInstance>()
+                    * 0.98f * RaindropInstance.GlobalInstance
                         .Client.Network.CurrentSim.Stats.Dilation;
                 BasePrim.Velocity += BasePrim.Acceleration * time;
             }
@@ -332,8 +332,8 @@ namespace Raindrop.Rendering
             try
             {
                 string fname = 
-                    ServiceLocator.Instance.Get<RaindropInstance>()
-                        .ComputeCacheName(ServiceLocator.Instance.Get<RaindropInstance>()
+                    RaindropInstance.GlobalInstance
+                        .ComputeCacheName(RaindropInstance.GlobalInstance
                             .Client.Settings.ASSET_CACHE_DIR, textureID) + ".rzi";
 
                 using (var f = File.Open(fname, FileMode.Open, FileAccess.Read, FileShare.Read))
@@ -382,7 +382,7 @@ namespace Raindrop.Rendering
         {
             try
             {
-                string fname = ServiceLocator.Instance.Get<RaindropInstance>().ComputeCacheName(ServiceLocator.Instance.Get<RaindropInstance>().Client.Settings.ASSET_CACHE_DIR, textureID) + ".rzi";
+                string fname = RaindropInstance.GlobalInstance.ComputeCacheName(RaindropInstance.GlobalInstance.Client.Settings.ASSET_CACHE_DIR, textureID) + ".rzi";
 
                 using (var f = File.Open(fname, FileMode.Create, FileAccess.Write, FileShare.None))
                 {
diff --git a/Assets/Raindrop/UI/AvatarInfo/AvatarInfoPresenter.cs b/Assets/Raindrop/UI/AvatarInfo/AvatarInfoPresenter.cs
index 460d726..a84958d 100644
--- a/Assets/Raindrop/UI/AvatarInfo/AvatarInfoPresenter.cs
+++ b/Assets/Raindrop/UI/AvatarInfo/AvatarInfoPresenter.cs
@@ -16,7 +16,7 @@ namespace Raindrop.Presenters
 
     public class AvatarInfoPresenter : MonoBehaviour
     {
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         private UIService uimanager => ServiceLocator.Instance.Get<UIService>();
         
diff --git a/Assets/Raindrop/UI/CanvasHelpers/ScreenStackManager.cs b/Assets/Raindrop/UI/CanvasHelpers/ScreenStackManager.cs
index d6a8866..c6823a2 100644
--- a/Assets/Raindrop/UI/CanvasHelpers/ScreenStackManager.cs
+++ b/Assets/Raindrop/UI/CanvasHelpers/ScreenStackManager.cs
@@ -74,7 +74,7 @@ public class ScreenStackManager : MonoBehaviour
 
     private bool IsEulaAccepted()
     {
-        if (ServiceLocator.Instance.Get<RaindropInstance>().GlobalSettings["EulaAccepted"])
+        if (RaindropInstance.GlobalInstance.GlobalSettings["EulaAccepted"])
         {
             return true;
         }
diff --git a/Assets/Raindrop/UI/Connectivity/toggleInteractivityBasedOnConnectionStatus.cs b/Assets/Raindrop/UI/Connectivity/toggleInteractivityBasedOnConnectionStatus.cs
index 2bbae6e..c6a72aa 100644
--- a/Assets/Raindrop/UI/Connectivity/toggleInteractivityBasedOnConnectionStatus.cs
+++ b/Assets/Raindrop/UI/Connectivity/toggleInteractivityBasedOnConnectionStatus.cs
@@ -16,7 +16,7 @@
 //     {
 //         notConnected();
 //         
-//         _instance = ServiceLocator.Instance.Get<RaindropInstance>();
+//         _instance = RaindropInstance.GlobalInstance;
 //     }
 //
 //
diff --git a/Assets/Raindrop/UI/EULA/EulaView.cs b/Assets/Raindrop/UI/EULA/EulaView.cs
index 3eb3410..4fc5122 100644
--- a/Assets/Raindrop/UI/EULA/EulaView.cs
+++ b/Assets/Raindrop/UI/EULA/EulaView.cs
@@ -9,7 +9,7 @@ using UnityEngine.UI;
 //a monobehavior that makes a toggle toggle the eula acceptance in globalSettings 
 public class EulaView : MonoBehaviour
 {
-    private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+    private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
     
     [Tooltip("the Acceptance toggle that allows us to continue past this window")]
     public Toggle EulaToggle;
diff --git a/Assets/Raindrop/UI/Game/GamePresenter.cs b/Assets/Raindrop/UI/Game/GamePresenter.cs
index 07e565b..7bcb667 100644
--- a/Assets/Raindrop/UI/Game/GamePresenter.cs
+++ b/Assets/Raindrop/UI/Game/GamePresenter.cs
@@ -15,7 +15,7 @@ namespace Raindrop.Presenters
         //2 . notifications - a dragdown list-like UI
         //3 . buttons to access other features.
 
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         private GridClient client { get { return instance.Client; } }
 
diff --git a/Assets/Raindrop/UI/GridSelection/GridSelectionController.cs b/Assets/Raindrop/UI/GridSelection/GridSelectionController.cs
index c4c989d..ba00008 100644
--- a/Assets/Raindrop/UI/GridSelection/GridSelectionController.cs
+++ b/Assets/Raindrop/UI/GridSelection/GridSelectionController.cs
@@ -14,7 +14,7 @@ namespace Raindrop.GridSelection
 
         //reference to model
         private RaindropInstance instance => 
-            ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance.GlobalInstance;
         private bool Ready => !(instance is null);
         private bool Connected => instance.Client.Network.Connected;
 
diff --git a/Assets/Raindrop/UI/Image/Texturable_RawImage.cs b/Assets/Raindrop/UI/Image/Texturable_RawImage.cs
index d076133..4634036 100644
--- a/Assets/Raindrop/UI/Image/Texturable_RawImage.cs
+++ b/Assets/Raindrop/UI/Image/Texturable_RawImage.cs
@@ -13,7 +13,7 @@ using Logger = OpenMetaverse.Logger;
 //coordinates the loading in of some UIimage.
 public class Texturable_RawImage : MonoBehaviour
 {
-    private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    private RaindropInstance instance => RaindropInstance.GlobalInstance;
     
     public UUID profileID;
     public GameObject LoadingImage;
diff --git a/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs b/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs
index 25e1fa6..67f9e26 100644
--- a/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs
+++ b/Assets/Raindrop/UI/LoadingScreen/LoadingController.cs
@@ -9,7 +9,7 @@ namespace Raindrop.UI.LoadingScreen
     public class LoadingController : IDisposable
     {
         private LoadingView view;
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
 
         public bool isInteractable => view.canvas.interactable;
diff --git a/Assets/Raindrop/UI/Login/GridNameView.cs b/Assets/Raindrop/UI/Login/GridNameView.cs
index 0ae2921..e58525f 100644
--- a/Assets/Raindrop/UI/Login/GridNameView.cs
+++ b/Assets/Raindrop/UI/Login/GridNameView.cs
@@ -7,7 +7,7 @@ using UnityEngine;
 // show the currently-select grid name.
 public class GridNameView : MonoBehaviour
 {
-    private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    private RaindropInstance instance => RaindropInstance.GlobalInstance;
 
     public TextView TextView;
 
diff --git a/Assets/Raindrop/UI/Login/LoginController.cs b/Assets/Raindrop/UI/Login/LoginController.cs
index 0c3bf81..c24415c 100644
--- a/Assets/Raindrop/UI/Login/LoginController.cs
+++ b/Assets/Raindrop/UI/Login/LoginController.cs
@@ -9,7 +9,7 @@ namespace Raindrop.UI.Login
 {
     public class LoginController
     {
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
         public RaindropNetcom netcom => instance.Netcom;
         private LoginPresenter view;
         public bool isDoingLogin;
diff --git a/Assets/Raindrop/UI/Login/LoginPresenter.cs b/Assets/Raindrop/UI/Login/LoginPresenter.cs
index fd632b2..112f78a 100644
--- a/Assets/Raindrop/UI/Login/LoginPresenter.cs
+++ b/Assets/Raindrop/UI/Login/LoginPresenter.cs
@@ -13,7 +13,7 @@ namespace Raindrop.UI.Login
 {
     public class LoginPresenter : MonoBehaviour
     {
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
 
         private UIService Uimanager =>
             ServiceLocator.Instance.Get<UIService>();
diff --git a/Assets/Raindrop/UI/LogoutButton.cs b/Assets/Raindrop/UI/LogoutButton.cs
new file mode 100644
index 0000000..03cfc76
--- /dev/null
+++ b/Assets/Raindrop/UI/LogoutButton.cs
@@ -0,0 +1,23 @@
+using Plugins.CommonDependencies;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Raindrop.UI
+{
+    [RequireComponent(typeof(Button))]
+    public class LogoutButton : MonoBehaviour
+    {
+        //get own references.
+        void Awake()
+        {
+            Button btn = this.GetComponent<Button>();
+            btn.onClick.AddListener(Logout);
+        }
+
+        private void Logout()
+        {
+            Debug.Log("logout requested by user UI");
+            RaindropInstance.GlobalInstance.Netcom.Logout();
+        }
+    }
+}
diff --git a/Assets/LogoutButton.cs.meta b/Assets/Raindrop/UI/LogoutButton.cs.meta
similarity index 100%
rename from Assets/LogoutButton.cs.meta
rename to Assets/Raindrop/UI/LogoutButton.cs.meta
diff --git a/Assets/Raindrop/UI/Map/LandmarkCard/LandmarkController.cs b/Assets/Raindrop/UI/Map/LandmarkCard/LandmarkController.cs
index 169e5f1..2b39b1c 100644
--- a/Assets/Raindrop/UI/Map/LandmarkCard/LandmarkController.cs
+++ b/Assets/Raindrop/UI/Map/LandmarkCard/LandmarkController.cs
@@ -40,7 +40,7 @@ public class LandmarkController : IDisposable
     #endregion
 
     #region globalrefs
-    private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+    private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
     private RaindropNetcom netcom { get { return instance.Netcom; } }
     private GridClient client { get { return instance.Client; } }
     bool Active => instance.Client.Network.Connected;
diff --git a/Assets/Raindrop/UI/Map/MapService/MapService.cs b/Assets/Raindrop/UI/Map/MapService/MapService.cs
index ca246ee..a7a21c8 100644
--- a/Assets/Raindrop/UI/Map/MapService/MapService.cs
+++ b/Assets/Raindrop/UI/Map/MapService/MapService.cs
@@ -39,7 +39,7 @@ namespace Raindrop.Map.Model
         private MapTilesRAM _mapTilesRam;
         private MapTilesNetwork mapTilesNetwork;
         
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
         // private bool Secondlife; //=> instance.Netcom.LoginOptions.Grid.Platform == "SecondLife";
         public bool isReady = false;
 
diff --git a/Assets/Raindrop/UI/Map/MapService/MapTilesNetwork.cs b/Assets/Raindrop/UI/Map/MapService/MapTilesNetwork.cs
index cb7e2f6..20e1e24 100644
--- a/Assets/Raindrop/UI/Map/MapService/MapTilesNetwork.cs
+++ b/Assets/Raindrop/UI/Map/MapService/MapTilesNetwork.cs
@@ -11,7 +11,7 @@ namespace Raindrop.Map.Model
     // for you to get map tiles from the network.
     public class MapTilesNetwork 
     {
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
 
         List<ulong> tileRequests = new List<ulong>(); // a list of pending fetch requests. the ulongs are the x and y world coordinates (gridX * 256), packed.
         private DownloadManager downloader;
diff --git a/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs b/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs
index 604f9e9..32edf67 100644
--- a/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs
+++ b/Assets/Raindrop/UI/Map/Map_SceneHierachy/MapScenePresenter.cs
@@ -17,7 +17,7 @@ namespace Raindrop.UI.map.Map_SceneHierachy
 
     public class MapScenePresenter : MonoBehaviour
     {
-        RaindropInstance Instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        RaindropInstance Instance => RaindropInstance.GlobalInstance;
         GridClient Client => Instance.Client;
         
         [SerializeField]
diff --git a/Assets/Raindrop/UI/Map/UI/MapUIView.cs b/Assets/Raindrop/UI/Map/UI/MapUIView.cs
index edfc3fd..1a8e055 100644
--- a/Assets/Raindrop/UI/Map/UI/MapUIView.cs
+++ b/Assets/Raindrop/UI/Map/UI/MapUIView.cs
@@ -25,7 +25,7 @@ namespace Raindrop.UI.Views
 
         public MapScenePresenter MapScenePresenter;
 
-        private GridClient Client => ServiceLocator.Instance.Get<RaindropInstance>().Client;
+        private GridClient Client => RaindropInstance.GlobalInstance.Client;
        
         //global handle: handle + the offset within the simulator.
         public void OnFocusMapPosition(ulong global_handle, RaycastHit raycastHit)
diff --git a/Assets/Raindrop/UI/Map/UI/ParcelInfoPopup.cs b/Assets/Raindrop/UI/Map/UI/ParcelInfoPopup.cs
index 484ae25..cb6640b 100644
--- a/Assets/Raindrop/UI/Map/UI/ParcelInfoPopup.cs
+++ b/Assets/Raindrop/UI/Map/UI/ParcelInfoPopup.cs
@@ -9,7 +9,7 @@ namespace Raindrop.UI.Views
 {
     public class ParcelInfoPopup : MonoBehaviour
     {
-        private GridClient Client => ServiceLocator.Instance.Get<RaindropInstance>().Client;
+        private GridClient Client => RaindropInstance.GlobalInstance.Client;
 
         public TMP_Text parcelNameTMP;
         public string parcelName;
diff --git a/Assets/Raindrop/UI/Notification/ModalsManager.cs b/Assets/Raindrop/UI/Notification/ModalsManager.cs
index 99e4ff2..7480d10 100644
--- a/Assets/Raindrop/UI/Notification/ModalsManager.cs
+++ b/Assets/Raindrop/UI/Notification/ModalsManager.cs
@@ -128,7 +128,7 @@ public class ModalsManager : MonoBehaviour
         ui.ModalsManager.showModal_NotificationGeneric(
             "The desired feature is not implemented yet: ",
             type.ToString() + " UI + \n \n + Stay tuned for updates!");
-        var instance = ServiceLocator.Instance.Get<RaindropInstance>();
+        var instance = RaindropInstance.GlobalInstance;
         instance.MediaManager.PlayUISound(UISounds.Warning);
     }
 }
diff --git a/Assets/Raindrop/UI/Notification/ntfGeneric.cs b/Assets/Raindrop/UI/Notification/ntfGeneric.cs
index 4635ec0..4087bb5 100644
--- a/Assets/Raindrop/UI/Notification/ntfGeneric.cs
+++ b/Assets/Raindrop/UI/Notification/ntfGeneric.cs
@@ -9,7 +9,7 @@ namespace Raindrop
     public class ntfGeneric : MonoBehaviour
     {
         private RaindropInstance instance =>
-            ServiceLocator.Instance.Get<RaindropInstance>();
+            RaindropInstance.GlobalInstance;
 
         public TMPro.TMP_Text txtMessage;
         public void Init(string msg)
diff --git a/Assets/Raindrop/UI/People/PeopleView.cs b/Assets/Raindrop/UI/People/PeopleView.cs
index dd6cb29..8e90f4c 100644
--- a/Assets/Raindrop/UI/People/PeopleView.cs
+++ b/Assets/Raindrop/UI/People/PeopleView.cs
@@ -12,7 +12,7 @@ using UnityEngine.Serialization;
 public class PeopleView : MonoBehaviour, IPointerClickHandler
 {
     public GridClient client => Instance.Client;
-    public RaindropInstance Instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    public RaindropInstance Instance => RaindropInstance.GlobalInstance;
 
     
     [SerializeField] public UUID agentID;
diff --git a/Assets/Raindrop/UI/Sound/ButtonSound.cs b/Assets/Raindrop/UI/Sound/ButtonSound.cs
index ef7d17c..4b2299a 100644
--- a/Assets/Raindrop/UI/Sound/ButtonSound.cs
+++ b/Assets/Raindrop/UI/Sound/ButtonSound.cs
@@ -9,7 +9,7 @@ using UnityEngine;
 public class ButtonSound : MonoBehaviour
 {
     
-    public RaindropInstance Instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    public RaindropInstance Instance => RaindropInstance.GlobalInstance;
 
     private LeanButton btn;
     void Awake()
diff --git a/Assets/Raindrop/UI/UpdateCameraBackend.cs b/Assets/Raindrop/UI/UpdateCameraBackend.cs
index 4398bf8..5c2b7da 100644
--- a/Assets/Raindrop/UI/UpdateCameraBackend.cs
+++ b/Assets/Raindrop/UI/UpdateCameraBackend.cs
@@ -20,7 +20,7 @@ public class UpdateCameraBackend : MonoBehaviour
     void Start()
     {
         cam = GetComponent<Camera>();
-        instance = ServiceLocator.Instance.Get<RaindropInstance>();
+        instance = RaindropInstance.GlobalInstance;
     }
 
     private void Update()
diff --git a/Assets/Raindrop/UI/UpdateMovementBackend.cs b/Assets/Raindrop/UI/UpdateMovementBackend.cs
index 07c391e..b0f6647 100644
--- a/Assets/Raindrop/UI/UpdateMovementBackend.cs
+++ b/Assets/Raindrop/UI/UpdateMovementBackend.cs
@@ -12,7 +12,7 @@ using Vector2 = UnityEngine.Vector2;
 //update the backend on user's (u,d,l,r)
 public class UpdateMovementBackend : MonoBehaviour
 {
-    private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+    private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
     private RaindropNetcom netcom { get { return instance.Netcom; } }
     private GridClient client { get { return instance.Client; } }
     bool Active => instance.Client.Network.Connected;
diff --git a/Assets/Raindrop/UI/chat/AddAChatView.cs b/Assets/Raindrop/UI/chat/AddAChatView.cs
index fce291b..434cc20 100644
--- a/Assets/Raindrop/UI/chat/AddAChatView.cs
+++ b/Assets/Raindrop/UI/chat/AddAChatView.cs
@@ -10,7 +10,7 @@ using UnityEngine.UI;
 // View logic for the modal that allows us to select a person to IM with. 
 public class AddAChatView : MonoBehaviour
 {
-    public RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    public RaindropInstance instance => RaindropInstance.GlobalInstance;
 
     public Button FriendsTab;
     public Button GroupsTab;
diff --git a/Assets/Raindrop/UI/chat/ChatBox/ChatInputPresenter.cs b/Assets/Raindrop/UI/chat/ChatBox/ChatInputPresenter.cs
index ed55c40..2733f38 100644
--- a/Assets/Raindrop/UI/chat/ChatBox/ChatInputPresenter.cs
+++ b/Assets/Raindrop/UI/chat/ChatBox/ChatInputPresenter.cs
@@ -17,7 +17,7 @@ namespace Raindrop.UI.chat
         // | hello there.. |SEND|
         // _____________________
 
-        public RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        public RaindropInstance instance => RaindropInstance.GlobalInstance;
 
         public IMPresenter DestChatInputAcceptor; // the monobehavior that accepts our input.
 
diff --git a/Assets/Raindrop/UI/chat/ChatBox/IMChat/IMPresenter.cs b/Assets/Raindrop/UI/chat/ChatBox/IMChat/IMPresenter.cs
index ac22c07..ea1ce47 100644
--- a/Assets/Raindrop/UI/chat/ChatBox/IMChat/IMPresenter.cs
+++ b/Assets/Raindrop/UI/chat/ChatBox/IMChat/IMPresenter.cs
@@ -10,7 +10,7 @@ namespace Raindrop.Presenters
 {
     public class IMPresenter : MonoBehaviour
     {
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
         private RaindropNetcom netcom => instance.Netcom;
         public TMPTextFieldPrinter printer; //the component in the textbox
         public IMManager manager;
diff --git a/Assets/Raindrop/UI/chat/ChatBox/LocalChat/LocalChatPresenter.cs b/Assets/Raindrop/UI/chat/ChatBox/LocalChat/LocalChatPresenter.cs
index 911d083..0963005 100644
--- a/Assets/Raindrop/UI/chat/ChatBox/LocalChat/LocalChatPresenter.cs
+++ b/Assets/Raindrop/UI/chat/ChatBox/LocalChat/LocalChatPresenter.cs
@@ -11,7 +11,7 @@ namespace Raindrop.UI.chat
     // for local chat, manage the printer and the input box.
     public class LocalChatPresenter : MonoBehaviour
     {
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
         private RaindropNetcom netcom => instance.Netcom;
         
         public TMPTextFieldPrinter printer; //the component in the textbox
diff --git a/Assets/Raindrop/UI/chat/ChatMainWindow/ChatManager.cs b/Assets/Raindrop/UI/chat/ChatMainWindow/ChatManager.cs
index 2a86bd8..6393a42 100644
--- a/Assets/Raindrop/UI/chat/ChatMainWindow/ChatManager.cs
+++ b/Assets/Raindrop/UI/chat/ChatMainWindow/ChatManager.cs
@@ -29,7 +29,7 @@ namespace Raindrop
         public ChatListView chatListView => presenter.chatListView;
 
 
-        RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        RaindropInstance instance => RaindropInstance.GlobalInstance;
         public ChatManager(ChatPresenter view)
         {
             this.presenter = view;
diff --git a/Assets/Raindrop/UI/chat/ChatMainWindow/ChatPresenter.cs b/Assets/Raindrop/UI/chat/ChatMainWindow/ChatPresenter.cs
index 48849d1..4a51510 100644
--- a/Assets/Raindrop/UI/chat/ChatMainWindow/ChatPresenter.cs
+++ b/Assets/Raindrop/UI/chat/ChatMainWindow/ChatPresenter.cs
@@ -30,7 +30,7 @@ namespace Raindrop.Presenters
         //right pane: the contents of the selected chat in the left pane.+
         //             input bar of the text to send to said chat.
 
-        private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+        private RaindropInstance instance => RaindropInstance.GlobalInstance;
 
         #region UI elements - left tabs 
         [FormerlySerializedAs("chatList")] [Tooltip("The container of the list of chat tabs.")]
diff --git a/Assets/Raindrop/UI/testing/prim_testrunner.cs b/Assets/Raindrop/UI/testing/prim_testrunner.cs
index 7adafb3..310a3f5 100644
--- a/Assets/Raindrop/UI/testing/prim_testrunner.cs
+++ b/Assets/Raindrop/UI/testing/prim_testrunner.cs
@@ -12,7 +12,7 @@ using Vector3 = OpenMetaverse.Vector3;
 public class prim_testrunner : MonoBehaviour
 {
     public ObjectManager obj_mgr;
-    public GridClient client => ServiceLocator.Instance.Get<RaindropInstance>().Client;
+    public GridClient client => RaindropInstance.GlobalInstance.Client;
 
     void Start()
     {
diff --git a/Assets/Raindrop/Unity3D/AgentPresenter.cs b/Assets/Raindrop/Unity3D/AgentPresenter.cs
index d37855f..5f14f02 100644
--- a/Assets/Raindrop/Unity3D/AgentPresenter.cs
+++ b/Assets/Raindrop/Unity3D/AgentPresenter.cs
@@ -24,7 +24,7 @@ namespace Raindrop.Presenters
             = new Dictionary<UUID, GameObject>(); //user UUID -> user gameobject in minimap
         public GameObject agentReference; //reference to the agent, if rezzed - it should.
 
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private RaindropNetcom netcom { get { return instance?.Netcom; } }
         private GridClient client { get { return instance?.Client; } }
         bool IsNetworkLayerActive => (instance != null) &&
diff --git a/Assets/Raindrop/Unity3D/MapPlayerLocationUpdater.cs b/Assets/Raindrop/Unity3D/MapPlayerLocationUpdater.cs
index 6a18000..4b96412 100644
--- a/Assets/Raindrop/Unity3D/MapPlayerLocationUpdater.cs
+++ b/Assets/Raindrop/Unity3D/MapPlayerLocationUpdater.cs
@@ -13,7 +13,7 @@ namespace Raindrop.Unity3D
     // see @ MapCoordinatesConversionTests
     class MapPlayerLocationUpdater : MonoBehaviour
     {
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         bool Active => instance.Client.Network.Connected;
 
diff --git a/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshController.cs b/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshController.cs
index d206356..c8eb46f 100644
--- a/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshController.cs
+++ b/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshController.cs
@@ -17,7 +17,7 @@ namespace Raindrop.Unity3D
     // it subscribes to the terrain of the sim it is responsible for rendering. 
     public class TerrainMeshController 
     {
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
         private GridClient Client { get { return instance.Client; } }
         private RaindropNetcom netcom { get { return instance.Netcom; } }
         bool Active => instance.Client.Network.Connected;
diff --git a/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshingDriver.cs b/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshingDriver.cs
index 418887e..44efaec 100644
--- a/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshingDriver.cs
+++ b/Assets/Raindrop/Unity3D/ObjectsRendering/TerrainMeshingDriver.cs
@@ -10,7 +10,7 @@ namespace Raindrop.Unity3D
     {
         public TerrainMeshView TerrainMeshView;
 
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
 
         private float lastRenderTime = 0;
         private void OnEnable()
diff --git a/Assets/Raindrop/WorldOrigin/Origin_SimHandle.cs b/Assets/Raindrop/WorldOrigin/Origin_SimHandle.cs
index 7cac589..8174c29 100644
--- a/Assets/Raindrop/WorldOrigin/Origin_SimHandle.cs
+++ b/Assets/Raindrop/WorldOrigin/Origin_SimHandle.cs
@@ -8,7 +8,7 @@ using UnityEngine;
 public class Origin_SimHandle : MonoBehaviour
 {
     public ulong simHandle => instance.Client.Network.CurrentSim.Handle;
-    private RaindropInstance instance => ServiceLocator.Instance.Get<RaindropInstance>();
+    private RaindropInstance instance => RaindropInstance.GlobalInstance;
     
     public ulong GetSimHandle()
     {
diff --git a/Assets/RaindropMainCameraDrawDistance.cs b/Assets/RaindropMainCameraDrawDistance.cs
deleted file mode 100644
index 7e8e111..0000000
--- a/Assets/RaindropMainCameraDrawDistance.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using OpenMetaverse;
-using Raindrop;
-using Raindrop.Services;
-using System.Collections;
-using System.Collections.Generic;
-using Plugins.CommonDependencies;
-using UnityEngine;
-
-[RequireComponent(typeof(Camera))]
-public class RaindropMainCameraDrawDistance : MonoBehaviour
-{
-    public float DrawDistance;
-    // private UIService ui => ServiceLocator.Instance.Get<UIService>();
-    private RaindropInstance Instance => ServiceLocator.Instance.Get<RaindropInstance>();
-    private GridClient Client => Instance.Client;
-
-    //private bool Active => ui.ScreensManager.TopCanvas.canvasType == CanvasType.Game;
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        if (!Instance.GlobalSettings.ContainsKey("draw_distance"))
-        {
-            Instance.GlobalSettings["draw_distance"] = DrawDistance;
-        }
-
-        this.GetComponent<Camera>().farClipPlane = DrawDistance;
-    }
-
-    void Update()
-    {
-        //if (!Active)
-        //{
-        //    return;
-        //}
-
-    }
-}
diff --git a/Assets/ResetMinimapCamera.cs b/Assets/ResetMinimapCamera.cs
index 5ad41bd..d6d91dc 100644
--- a/Assets/ResetMinimapCamera.cs
+++ b/Assets/ResetMinimapCamera.cs
@@ -12,7 +12,7 @@ using UnityEngine;
 [RequireComponent(typeof(OrthographicCameraView))]
 public class ResetMinimapCamera : MonoBehaviour
 {
-    private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+    private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
     bool Active => instance.Client.Network.Connected;
 
     public OrthographicCameraView cam;
diff --git a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/EulaAcceptanceTests.cs b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/EulaAcceptanceTests.cs
index 94a4b35..0532ba1 100644
--- a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/EulaAcceptanceTests.cs
+++ b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/EulaAcceptanceTests.cs
@@ -54,7 +54,7 @@ namespace Raindrop.Tests.RaindropFullIntegrationTests
             yield return new WaitForSeconds(2);
 
             //1. reject the EULA
-            var instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            var instance = RaindropInstance.GlobalInstance;
             instance.GlobalSettings["EulaAccepted"] = false;
             instance.GlobalSettings.Save();
             Assert.False(instance.GlobalSettings["EulaAccepted"]);
diff --git a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LocalChatTests.cs b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LocalChatTests.cs
index 43d9267..bad29dd 100644
--- a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LocalChatTests.cs
+++ b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LocalChatTests.cs
@@ -15,7 +15,7 @@ namespace Raindrop.Tests.RaindropFullIntegrationTests
     {
         
         private RaindropNetcom netcom { get { return instance.Netcom; } }
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
 
         [OneTimeSetUp]
         public void OneTimeSetUp()
diff --git a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LoginTests.cs b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LoginTests.cs
index 5be9e32..d87a383 100644
--- a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LoginTests.cs
+++ b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/LoginTests.cs
@@ -21,7 +21,7 @@ namespace Raindrop.Tests.RaindropFullIntegrationTests
     public class LoginTests
     {
         private RaindropNetcom netcom { get { return instance.Netcom; } }
-        private RaindropInstance instance { get { return ServiceLocator.Instance.Get<RaindropInstance>(); } }
+        private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } }
 
         [SetUp]
         public void SetUp()
diff --git a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/SoundTests.cs b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/SoundTests.cs
index 703af35..110b550 100644
--- a/Assets/Tests/Raindrop/RaindropFullIntegrationTests/SoundTests.cs
+++ b/Assets/Tests/Raindrop/RaindropFullIntegrationTests/SoundTests.cs
@@ -40,7 +40,7 @@ namespace Tests.Raindrop.SoundTests
         {
             yield return new WaitForSeconds(5);
 
-            var instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            var instance = RaindropInstance.GlobalInstance;
             var internalDir = instance.UserDir;
 
             //copy the sound file to cache path in a haphazard manner:
@@ -86,7 +86,7 @@ namespace Tests.Raindrop.SoundTests
         [UnityTest]
         public IEnumerator OfflineUncachedSound_Playable_ButNoSound()
         {
-            var instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            var instance = RaindropInstance.GlobalInstance;
 
             instance.MediaManager.PlayUISound(UUID.Zero); 
 
diff --git a/Assets/Tests/Raindrop/RaindropIntegrationTests/GridSelectorTests/GridSelectorTests.cs b/Assets/Tests/Raindrop/RaindropIntegrationTests/GridSelectorTests/GridSelectorTests.cs
index df7dea9..d9e1c16 100644
--- a/Assets/Tests/Raindrop/RaindropIntegrationTests/GridSelectorTests/GridSelectorTests.cs
+++ b/Assets/Tests/Raindrop/RaindropIntegrationTests/GridSelectorTests/GridSelectorTests.cs
@@ -21,7 +21,7 @@ namespace Raindrop.Tests.RaindropIntegrationTests.GridSelectorTests
             yield return SceneLoader.LoadHeadlessScene();
         
             //at this point, raindropInstance is ready.
-            var instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            var instance = RaindropInstance.GlobalInstance;
             Assert.True(instance!=null, "instance is null");
         
             //+++++++++++++finish load test scene+++++++
diff --git a/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs b/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs
index 44e8b1e..1396be6 100644
--- a/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs
+++ b/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs
@@ -27,7 +27,7 @@ namespace Raindrop.Tests.RaindropIntegrationTests.Helpers
                 bootstrap.GetComponent<RaindropBootstrapper>();
             Assert.True(raindropBootstrapper);
 
-            var instance = ServiceLocator.Instance.Get<RaindropInstance>();
+            var instance = RaindropInstance.GlobalInstance;
             Assert.True(instance != null);
         }