aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authordiva2009-01-01 19:42:24 +0000
committerdiva2009-01-01 19:42:24 +0000
commitd8ebf2fc9d7d2e50735d50e75f7153f487efe958 (patch)
treec14d5e80e3d34d0a2f547cb3d0b965dea8e55e90 /OpenSim/Framework
parentMinor fix for HG request neighbors. Should not return hyperlink neighbors, on... (diff)
downloadopensim-SC-d8ebf2fc9d7d2e50735d50e75f7153f487efe958.zip
opensim-SC-d8ebf2fc9d7d2e50735d50e75f7153f487efe958.tar.gz
opensim-SC-d8ebf2fc9d7d2e50735d50e75f7153f487efe958.tar.bz2
opensim-SC-d8ebf2fc9d7d2e50735d50e75f7153f487efe958.tar.xz
Major changes in interregion communications. This breaks compatibility with older versions, and may result is all sorts of weirdnesses when interacting with sims in older versions. Changes:
- Introducing synchronous Teleports. Now the receiving region calls back the sending region after the client has been made a root agent there, that is, after client sends CompleteMovement to the destination. - SendCloseAgent moved from OGS1 Remoting to RESTComms.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 257f435..f3ac943 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -144,6 +144,7 @@ namespace OpenSim.Framework
144 144
145 byte[] VisualParams; 145 byte[] VisualParams;
146 146
147 public string CallbackURI;
147 148
148 public OSDMap PackUpdateMessage() 149 public OSDMap PackUpdateMessage()
149 { 150 {
@@ -191,6 +192,9 @@ namespace OpenSim.Framework
191 192
192 // Last few fields are still missing 193 // Last few fields are still missing
193 194
195 if ((CallbackURI != null) && (!CallbackURI.Equals("")))
196 args["callback_uri"] = OSD.FromString(CallbackURI);
197
194 return args; 198 return args;
195 } 199 }
196 200
@@ -284,6 +288,9 @@ namespace OpenSim.Framework
284 288
285 if (args["active_group_id"] != null) 289 if (args["active_group_id"] != null)
286 ActiveGroupID = args["active_group_id"].AsUUID(); 290 ActiveGroupID = args["active_group_id"].AsUUID();
291
292 if (args["callback_uri"] != null)
293 CallbackURI = args["callback_uri"].AsString();
287 } 294 }
288 295
289 public AgentData() 296 public AgentData()