aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-07 09:25:18 +0300
committerOren Hurvitz2014-04-07 07:32:36 +0100
commit85d51e57a905ac8f823f345f525837926f4ed2ce (patch)
tree7fc86c9a7743afb0765cc8d822709e12bbc223f1 /OpenSim/Server
parentRefactored: use Scene.GetAgentHomeURI() to get the Home URI of a user (diff)
downloadopensim-SC_OLD-85d51e57a905ac8f823f345f525837926f4ed2ce.zip
opensim-SC_OLD-85d51e57a905ac8f823f345f525837926f4ed2ce.tar.gz
opensim-SC_OLD-85d51e57a905ac8f823f345f525837926f4ed2ce.tar.bz2
opensim-SC_OLD-85d51e57a905ac8f823f345f525837926f4ed2ce.tar.xz
When sending QueryAccess to a region, also send the user's Home URI
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 9c7f17e..c495b60 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Server.Handlers.Simulation
117 117
118 } 118 }
119 119
120 protected virtual void DoQueryAccess(Hashtable request, Hashtable responsedata, UUID id, UUID regionID) 120 protected virtual void DoQueryAccess(Hashtable request, Hashtable responsedata, UUID agentID, UUID regionID)
121 { 121 {
122 if (m_SimulationService == null) 122 if (m_SimulationService == null)
123 { 123 {
@@ -136,12 +136,16 @@ namespace OpenSim.Server.Handlers.Simulation
136 if (args.ContainsKey("position")) 136 if (args.ContainsKey("position"))
137 position = Vector3.Parse(args["position"].AsString()); 137 position = Vector3.Parse(args["position"].AsString());
138 138
139 string agentHomeURI = null;
140 if (args.ContainsKey("agent_home_uri"))
141 agentHomeURI = args["agent_home_uri"].AsString();
142
139 GridRegion destination = new GridRegion(); 143 GridRegion destination = new GridRegion();
140 destination.RegionID = regionID; 144 destination.RegionID = regionID;
141 145
142 string reason; 146 string reason;
143 string version; 147 string version;
144 bool result = m_SimulationService.QueryAccess(destination, id, position, out version, out reason); 148 bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, position, out version, out reason);
145 149
146 responsedata["int_response_code"] = HttpStatusCode.OK; 150 responsedata["int_response_code"] = HttpStatusCode.OK;
147 151