From b48cbcbfdda1bf348a77554958bebea33560dbe6 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 14 Nov 2018 16:23:14 +0000
Subject: simplify a bit some caps paths

---
 .../CoreModules/World/LightShare/EnvironmentModule.cs       | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
index 02378f2..4d7da65 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -51,10 +51,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private Scene m_scene = null;
         private UUID regionID = UUID.Zero;
-        private static bool Enabled = false;
-
-        private static readonly string capsName = "EnvironmentSettings";
-        private static readonly string capsBase = "/CAPS/0020/";
+        private bool Enabled = false;
 
         #region INonSharedRegionModule
         public void Initialise(IConfigSource source)
@@ -133,17 +130,17 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             //            m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
             //                Name, agentID, caps.RegionName);
 
-            string capsPath = capsBase + UUID.Random();
+            string capsPath = "/CAPS/" + UUID.Random();
 
             // Get handler
             caps.RegisterHandler(
-                capsName,
+                "EnvironmentSettings",
                 new RestStreamHandler(
                     "GET",
                     capsPath,
                     (request, path, param, httpRequest, httpResponse)
                      => GetEnvironmentSettings(request, path, param, agentID, caps),
-                     capsName,
+                     "EnvironmentSettings",
                      agentID.ToString()));
 
             // Set handler
@@ -153,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                 capsPath,
                 (request, path, param, httpRequest, httpResponse)
                  => SetEnvironmentSettings(request, path, param, agentID, caps),
-                 capsName,
+                 "EnvironmentSettings",
                  agentID.ToString()));
         }
         #endregion
-- 
cgit v1.1