aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-10 00:46:56 +0000
committerTeravus Ovares2007-12-10 00:46:56 +0000
commite595f82489ae91c2a913f2ac8445b3d5dbe160d0 (patch)
tree3c4c3ca6c42fefb3904f8eb211bfb38bac52ef0d /OpenSim/Framework
parentAdded a call to m_host.SendFullUpdateToAllClients(). (diff)
downloadopensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.zip
opensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.gz
opensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.bz2
opensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.xz
* Hooked up the GridComm event ChildDataUpdate to the scene.
* Added List<RegionInfo> m_neighbours to Scene * Hooked up the OnRegionUp event to m_neighbours list * Modified RegionInfo to have a bool commFailTF value so that we can skip neighbors that fail. (when the region comes up, this gets reset to false and the region will try again. * Added SetChildAgentThrottle(byte[]) to IClientAPI * Several other insignificant changes related to passing child pertanant agent data from sim to sim.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 773b5eb..43c8c70 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -480,7 +480,7 @@ namespace OpenSim.Framework
480 void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations); 480 void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations);
481 481
482 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 482 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
483 483 void SetChildAgentThrottle(byte[] throttle);
484 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 484 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
485 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, 485 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color,
486 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction); 486 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction);
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 770107f..ac040c5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -186,6 +186,7 @@ namespace OpenSim.Framework
186 186
187 public string DataStore = ""; 187 public string DataStore = "";
188 public bool isSandbox = false; 188 public bool isSandbox = false;
189 public bool commFailTF = false;
189 190
190 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; 191 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
191 public string MasterAvatarFirstName = ""; 192 public string MasterAvatarFirstName = "";