aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorUbitUmarov2018-11-14 16:23:14 +0000
committerUbitUmarov2018-11-14 16:23:14 +0000
commitb48cbcbfdda1bf348a77554958bebea33560dbe6 (patch)
tree37aa567ef790dd0af446095e370c76f7d741b513 /OpenSim/Region/CoreModules/World
parentreplace Enviroment response encoding ( runprebuild needed) (diff)
downloadopensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.zip
opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.gz
opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.bz2
opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.xz
simplify a bit some caps paths
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs13
1 files changed, 5 insertions, 8 deletions
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
51 51
52 private Scene m_scene = null; 52 private Scene m_scene = null;
53 private UUID regionID = UUID.Zero; 53 private UUID regionID = UUID.Zero;
54 private static bool Enabled = false; 54 private bool Enabled = false;
55
56 private static readonly string capsName = "EnvironmentSettings";
57 private static readonly string capsBase = "/CAPS/0020/";
58 55
59 #region INonSharedRegionModule 56 #region INonSharedRegionModule
60 public void Initialise(IConfigSource source) 57 public void Initialise(IConfigSource source)
@@ -133,17 +130,17 @@ namespace OpenSim.Region.CoreModules.World.LightShare
133 // m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}", 130 // m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
134 // Name, agentID, caps.RegionName); 131 // Name, agentID, caps.RegionName);
135 132
136 string capsPath = capsBase + UUID.Random(); 133 string capsPath = "/CAPS/" + UUID.Random();
137 134
138 // Get handler 135 // Get handler
139 caps.RegisterHandler( 136 caps.RegisterHandler(
140 capsName, 137 "EnvironmentSettings",
141 new RestStreamHandler( 138 new RestStreamHandler(
142 "GET", 139 "GET",
143 capsPath, 140 capsPath,
144 (request, path, param, httpRequest, httpResponse) 141 (request, path, param, httpRequest, httpResponse)
145 => GetEnvironmentSettings(request, path, param, agentID, caps), 142 => GetEnvironmentSettings(request, path, param, agentID, caps),
146 capsName, 143 "EnvironmentSettings",
147 agentID.ToString())); 144 agentID.ToString()));
148 145
149 // Set handler 146 // Set handler
@@ -153,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
153 capsPath, 150 capsPath,
154 (request, path, param, httpRequest, httpResponse) 151 (request, path, param, httpRequest, httpResponse)
155 => SetEnvironmentSettings(request, path, param, agentID, caps), 152 => SetEnvironmentSettings(request, path, param, agentID, caps),
156 capsName, 153 "EnvironmentSettings",
157 agentID.ToString())); 154 agentID.ToString()));
158 } 155 }
159 #endregion 156 #endregion