aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-08-18 13:17:36 +0100
committerUbitUmarov2016-08-18 13:17:46 +0100
commit4b73550eeeafa52e23c326c9b2e87ac4e9624b7b (patch)
tree4aefa2b68cc7e504109cc5b531572abfe5490fa1 /OpenSim/Region
parentadd caps HomeLocation ; add client SendAlertMessage(string message, string in... (diff)
downloadopensim-SC_OLD-4b73550eeeafa52e23c326c9b2e87ac4e9624b7b.zip
opensim-SC_OLD-4b73550eeeafa52e23c326c9b2e87ac4e9624b7b.tar.gz
opensim-SC_OLD-4b73550eeeafa52e23c326c9b2e87ac4e9624b7b.tar.bz2
opensim-SC_OLD-4b73550eeeafa52e23c326c9b2e87ac4e9624b7b.tar.xz
allow cap HomeLocation to be disabled setting Cap_HomeLocation = ""
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs19
1 files changed, 16 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index bedd3d0..f5b46bd 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -122,6 +122,8 @@ namespace OpenSim.Region.ClientStack.Linden
122 122
123 private float m_PrimScaleMin = 0.001f; 123 private float m_PrimScaleMin = 0.001f;
124 124
125 private bool m_AllowCapHomeLocation = true;
126
125 private enum FileAgentInventoryState : int 127 private enum FileAgentInventoryState : int
126 { 128 {
127 idle = 0, 129 idle = 0,
@@ -176,6 +178,15 @@ namespace OpenSim.Region.ClientStack.Linden
176 m_testAssetsCreatorID = id; 178 m_testAssetsCreatorID = id;
177 } 179 }
178 } 180 }
181
182 IConfig CapsConfig = config.Configs["ClientStack.LindenCaps"];
183 if (CapsConfig != null)
184 {
185 string homeLocationUrl = CapsConfig.GetString("Cap_HomeLocation", "localhost");
186 if(homeLocationUrl == String.Empty)
187 m_AllowCapHomeLocation = false;
188
189 }
179 } 190 }
180 191
181 m_assetService = m_Scene.AssetService; 192 m_assetService = m_Scene.AssetService;
@@ -241,10 +252,12 @@ namespace OpenSim.Region.ClientStack.Linden
241 m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req); 252 m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req);
242 m_HostCapsObj.RegisterHandler("UpdateScriptTask", req); 253 m_HostCapsObj.RegisterHandler("UpdateScriptTask", req);
243 254
244 IRequestHandler HomeLocationHandler = new RestStreamHandler( 255 if(m_AllowCapHomeLocation)
256 {
257 IRequestHandler HomeLocationHandler = new RestStreamHandler(
245 "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null); 258 "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null);
246 m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler); 259 m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler);
247 260 }
248// IRequestHandler animSetRequestHandler 261// IRequestHandler animSetRequestHandler
249// = new RestStreamHandler( 262// = new RestStreamHandler(
250// "POST", capsBase + m_animSetTaskUpdatePath, AnimSetTaskInventory, "UpdateScript", null); 263// "POST", capsBase + m_animSetTaskUpdatePath, AnimSetTaskInventory, "UpdateScript", null);