OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow cap HomeLocation to be disabled setting Cap_HomeLocation = ""

LSLKeyTest
UbitUmarov 2016-08-18 13:17:36 +01:00
parent ac542715f1
commit 4b73550eee
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -122,6 +122,8 @@ namespace OpenSim.Region.ClientStack.Linden
private float m_PrimScaleMin = 0.001f; private float m_PrimScaleMin = 0.001f;
private bool m_AllowCapHomeLocation = true;
private enum FileAgentInventoryState : int private enum FileAgentInventoryState : int
{ {
idle = 0, idle = 0,
@ -176,6 +178,15 @@ namespace OpenSim.Region.ClientStack.Linden
m_testAssetsCreatorID = id; m_testAssetsCreatorID = id;
} }
} }
IConfig CapsConfig = config.Configs["ClientStack.LindenCaps"];
if (CapsConfig != null)
{
string homeLocationUrl = CapsConfig.GetString("Cap_HomeLocation", "localhost");
if(homeLocationUrl == String.Empty)
m_AllowCapHomeLocation = false;
}
} }
m_assetService = m_Scene.AssetService; m_assetService = m_Scene.AssetService;
@ -241,10 +252,12 @@ namespace OpenSim.Region.ClientStack.Linden
m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req); m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req);
m_HostCapsObj.RegisterHandler("UpdateScriptTask", req); m_HostCapsObj.RegisterHandler("UpdateScriptTask", req);
IRequestHandler HomeLocationHandler = new RestStreamHandler( if(m_AllowCapHomeLocation)
{
IRequestHandler HomeLocationHandler = new RestStreamHandler(
"POST", GetNewCapPath(), HomeLocation, "HomeLocation", null); "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null);
m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler); m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler);
}
// IRequestHandler animSetRequestHandler // IRequestHandler animSetRequestHandler
// = new RestStreamHandler( // = new RestStreamHandler(
// "POST", capsBase + m_animSetTaskUpdatePath, AnimSetTaskInventory, "UpdateScript", null); // "POST", capsBase + m_animSetTaskUpdatePath, AnimSetTaskInventory, "UpdateScript", null);

2
bin/OpenSimDefaults.ini
View File

@ -725,7 +725,7 @@
Cap_GetObjectCost = "" Cap_GetObjectCost = ""
Cap_GetObjectPhysicsData = "" Cap_GetObjectPhysicsData = ""
Cap_GroupProposalBallot = "" Cap_GroupProposalBallot = ""
Cap_HomeLocation = "" Cap_HomeLocation = "localhost"
Cap_LandResources = "" Cap_LandResources = ""
Cap_MapLayer = "localhost" Cap_MapLayer = "localhost"
Cap_MapLayerGod = "localhost" Cap_MapLayerGod = "localhost"