aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-29 02:14:27 +0000
committerTeravus Ovares2008-05-29 02:14:27 +0000
commit3e0244c633ceff5feb8ef19ae26110fe26493285 (patch)
treeca70e3cf9f8e6895918818347d547778ea90679b /OpenSim
parent* Fixed a slight issue with the LLRAW exporter. (diff)
downloadopensim-SC_OLD-3e0244c633ceff5feb8ef19ae26110fe26493285.zip
opensim-SC_OLD-3e0244c633ceff5feb8ef19ae26110fe26493285.tar.gz
opensim-SC_OLD-3e0244c633ceff5feb8ef19ae26110fe26493285.tar.bz2
opensim-SC_OLD-3e0244c633ceff5feb8ef19ae26110fe26493285.tar.xz
* Added a child agent check to the ChildAgentData Update to make sure that you're a child agent before applying the changes from the grid comms. Doing this to rule it out as a source of a few bugs such as the Zombie bug and the Express Train to 0,0,0 bug.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index dfefe24..6a22ddb 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1754,6 +1754,9 @@ namespace OpenSim.Region.Environment.Scenes
1754 public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) 1754 public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
1755 { 1755 {
1756 // 1756 //
1757 if (!IsChildAgent)
1758 return;
1759
1757 int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize; 1760 int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
1758 int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize; 1761 int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
1759 1762
@@ -1766,7 +1769,8 @@ namespace OpenSim.Region.Environment.Scenes
1766 1769
1767 1770
1768 m_godlevel = cAgentData.godlevel; 1771 m_godlevel = cAgentData.godlevel;
1769 SetHeight(cAgentData.AVHeight); 1772 m_avHeight = cAgentData.AVHeight;
1773 //SetHeight(cAgentData.AVHeight);
1770 1774
1771 ControllingClient.SetChildAgentThrottle(cAgentData.throttles); 1775 ControllingClient.SetChildAgentThrottle(cAgentData.throttles);
1772 1776