aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorlbsa712007-09-20 13:04:51 +0000
committerlbsa712007-09-20 13:04:51 +0000
commit7335e5710bd0c22c9e5bd9fa0b576d0985d2fba9 (patch)
tree866c1cf215fddc3404181c679783f903c925e000 /OpenSim/Region/Environment/Modules
parent* moved SceneManager to RegionApplicationBase (diff)
downloadopensim-SC_OLD-7335e5710bd0c22c9e5bd9fa0b576d0985d2fba9.zip
opensim-SC_OLD-7335e5710bd0c22c9e5bd9fa0b576d0985d2fba9.tar.gz
opensim-SC_OLD-7335e5710bd0c22c9e5bd9fa0b576d0985d2fba9.tar.bz2
opensim-SC_OLD-7335e5710bd0c22c9e5bd9fa0b576d0985d2fba9.tar.xz
Rev 1971 : The Lbsa71 vintage commit
* Refactored to prepare for some serious restructuring
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index fb6c5d2..dfbb2bb 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Environment.Modules
137 LLUUID fromAgentID) 137 LLUUID fromAgentID)
138 { 138 {
139 ScenePresence avatar = null; 139 ScenePresence avatar = null;
140 avatar = m_scene.RequestAvatar(fromAgentID); 140 avatar = m_scene.GetScenePresence(fromAgentID);
141 if (avatar != null) 141 if (avatar != null)
142 { 142 {
143 fromPos = avatar.AbsolutePosition; 143 fromPos = avatar.AbsolutePosition;
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Modules
159 int dis = -1000; 159 int dis = -1000;
160 160
161 //err ??? the following code seems to be request a scenePresence when it already has a ref to it 161 //err ??? the following code seems to be request a scenePresence when it already has a ref to it
162 avatar = m_scene.RequestAvatar(presence.ControllingClient.AgentId); 162 avatar = m_scene.GetScenePresence(presence.ControllingClient.AgentId);
163 if (avatar != null) 163 if (avatar != null)
164 { 164 {
165 dis = (int) avatar.AbsolutePosition.GetDistanceTo(fromPos); 165 dis = (int) avatar.AbsolutePosition.GetDistanceTo(fromPos);