diff options
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 19 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
2 files changed, 17 insertions, 4 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); |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index df92921..dbc09fd 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -725,7 +725,7 @@ | |||
725 | Cap_GetObjectCost = "" | 725 | Cap_GetObjectCost = "" |
726 | Cap_GetObjectPhysicsData = "" | 726 | Cap_GetObjectPhysicsData = "" |
727 | Cap_GroupProposalBallot = "" | 727 | Cap_GroupProposalBallot = "" |
728 | Cap_HomeLocation = "" | 728 | Cap_HomeLocation = "localhost" |
729 | Cap_LandResources = "" | 729 | Cap_LandResources = "" |
730 | Cap_MapLayer = "localhost" | 730 | Cap_MapLayer = "localhost" |
731 | Cap_MapLayerGod = "localhost" | 731 | Cap_MapLayerGod = "localhost" |