diff options
author | Teravus Ovares | 2007-12-10 00:46:56 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-10 00:46:56 +0000 |
commit | e595f82489ae91c2a913f2ac8445b3d5dbe160d0 (patch) | |
tree | 3c4c3ca6c42fefb3904f8eb211bfb38bac52ef0d /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | Added a call to m_host.SendFullUpdateToAllClients(). (diff) | |
download | opensim-SC-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.zip opensim-SC-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.gz opensim-SC-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.bz2 opensim-SC-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/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index f8571a9..ebd08b4 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -53,6 +53,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | private uint m_requestedSitTargetID = 0; | 53 | private uint m_requestedSitTargetID = 0; |
54 | private LLVector3 m_requestedSitOffset = new LLVector3(); | 54 | private LLVector3 m_requestedSitOffset = new LLVector3(); |
55 | private float m_sitAvatarHeight = 2.0f; | 55 | private float m_sitAvatarHeight = 2.0f; |
56 | private float m_godlevel = 0; | ||
56 | 57 | ||
57 | private bool m_isTyping = false; | 58 | private bool m_isTyping = false; |
58 | private bool m_setAlwaysRun = false; | 59 | private bool m_setAlwaysRun = false; |
@@ -1255,7 +1256,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
1255 | respondPacket.AgentData = adb; | 1256 | respondPacket.AgentData = adb; |
1256 | ControllingClient.OutPacket(respondPacket, ThrottleOutPacketType.Task); | 1257 | ControllingClient.OutPacket(respondPacket, ThrottleOutPacketType.Task); |
1257 | } | 1258 | } |
1259 | public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData) | ||
1260 | { | ||
1261 | // | ||
1262 | m_DrawDistance = cAgentData.drawdistance; | ||
1263 | m_pos = new LLVector3(cAgentData.Position.x, cAgentData.Position.y, cAgentData.Position.z); | ||
1264 | m_CameraCenter = new Vector3(cAgentData.cameraPosition.x, cAgentData.cameraPosition.y, cAgentData.cameraPosition.z); | ||
1265 | m_godlevel = cAgentData.godlevel; | ||
1266 | ControllingClient.SetChildAgentThrottle(cAgentData.throttles); | ||
1267 | //cAgentData.AVHeight; | ||
1268 | //cAgentData.regionHandle; | ||
1269 | //m_velocity = cAgentData.Velocity; | ||
1270 | |||
1258 | 1271 | ||
1272 | } | ||
1259 | /// <summary> | 1273 | /// <summary> |
1260 | /// | 1274 | /// |
1261 | /// </summary> | 1275 | /// </summary> |