diff options
| author | Dan Lake | 2010-03-19 05:58:34 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-03-19 15:16:44 -0700 |
| commit | 62e0b53ca4697a852ee1e36e86da6a32e93bd55e (patch) | |
| tree | aacaa4c84a0b7e61784909ca76fb1528ca06938b /OpenSim/Services | |
| parent | Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetA... (diff) | |
| download | opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.zip opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.gz opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.bz2 opensim-SC-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.xz | |
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 5e0f7c2..f47bfbb 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
| @@ -301,7 +301,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 301 | private void SignificantClientMovementHandler(IClientAPI client) | 301 | private void SignificantClientMovementHandler(IClientAPI client) |
| 302 | { | 302 | { |
| 303 | ScenePresence sp; | 303 | ScenePresence sp; |
| 304 | if (client.Scene is Scene && ((Scene)client.Scene).TryGetAvatar(client.AgentId, out sp)) | 304 | if (client.Scene is Scene && ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out sp)) |
| 305 | ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | 305 | ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); |
| 306 | } | 306 | } |
| 307 | 307 | ||
| @@ -312,7 +312,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 312 | client.OnConnectionClosed -= LogoutHandler; | 312 | client.OnConnectionClosed -= LogoutHandler; |
| 313 | 313 | ||
| 314 | object obj; | 314 | object obj; |
| 315 | if (client.Scene.TryGetAvatar(client.AgentId, out obj) && obj is ScenePresence) | 315 | if (client.Scene.TryGetScenePresence(client.AgentId, out obj) && obj is ScenePresence) |
| 316 | { | 316 | { |
| 317 | // The avatar is still in the scene, we can get the exact logout position | 317 | // The avatar is still in the scene, we can get the exact logout position |
| 318 | ScenePresence sp = (ScenePresence)obj; | 318 | ScenePresence sp = (ScenePresence)obj; |