diff options
author | Justin Clarke Casey | 2008-11-28 20:11:17 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-28 20:11:17 +0000 |
commit | dfbec673a4ca24ab683ea403361efa4372cc1e0d (patch) | |
tree | 4a561fa5ce77121f201008e6ea14ff5a0ba48fd4 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Committing a new test, that will fail until someone decides to fix Location... (diff) | |
download | opensim-SC-dfbec673a4ca24ab683ea403361efa4372cc1e0d.zip opensim-SC-dfbec673a4ca24ab683ea403361efa4372cc1e0d.tar.gz opensim-SC-dfbec673a4ca24ab683ea403361efa4372cc1e0d.tar.bz2 opensim-SC-dfbec673a4ca24ab683ea403361efa4372cc1e0d.tar.xz |
* simplify AddNewClient since making this root without using MakeRootAgent() no longer sets everything up properly
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e544703..97442fd 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2229,7 +2229,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2229 | 2229 | ||
2230 | #region Add/Remove Avatar Methods | 2230 | #region Add/Remove Avatar Methods |
2231 | 2231 | ||
2232 | public override void AddNewClient(IClientAPI client, bool child) | 2232 | public override void AddNewClient(IClientAPI client) |
2233 | { | 2233 | { |
2234 | SubscribeToClientEvents(client); | 2234 | SubscribeToClientEvents(client); |
2235 | ScenePresence presence; | 2235 | ScenePresence presence; |
@@ -2261,12 +2261,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
2261 | else | 2261 | else |
2262 | { | 2262 | { |
2263 | m_log.DebugFormat( | 2263 | m_log.DebugFormat( |
2264 | "[SCENE]: Adding new {0} agent {1} {2} in {3}", | 2264 | "[SCENE]: Adding new child agent {0} for new user connection in {1}", |
2265 | (child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName); | 2265 | client.Name, RegionInfo.RegionName); |
2266 | 2266 | ||
2267 | CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); | 2267 | CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); |
2268 | 2268 | ||
2269 | CreateAndAddScenePresence(client, child); | 2269 | CreateAndAddScenePresence(client); |
2270 | } | 2270 | } |
2271 | 2271 | ||
2272 | m_LastLogin = System.Environment.TickCount; | 2272 | m_LastLogin = System.Environment.TickCount; |
@@ -2547,17 +2547,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
2547 | } | 2547 | } |
2548 | 2548 | ||
2549 | /// <summary> | 2549 | /// <summary> |
2550 | /// Create a scene presence and add it to this scene. | 2550 | /// Create a child agent scene presence and add it to this scene. |
2551 | /// </summary> | 2551 | /// </summary> |
2552 | /// <param name="client"></param> | 2552 | /// <param name="client"></param> |
2553 | /// <param name="child"></param> | ||
2554 | /// <returns></returns> | 2553 | /// <returns></returns> |
2555 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) | 2554 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client) |
2556 | { | 2555 | { |
2557 | AvatarAppearance appearance = null; | 2556 | AvatarAppearance appearance = null; |
2558 | GetAvatarAppearance(client, out appearance); | 2557 | GetAvatarAppearance(client, out appearance); |
2559 | 2558 | ||
2560 | ScenePresence avatar = m_sceneGraph.CreateAndAddScenePresence(client, child, appearance); | 2559 | ScenePresence avatar = m_sceneGraph.CreateAndAddChildScenePresence(client, appearance); |
2561 | 2560 | ||
2562 | return avatar; | 2561 | return avatar; |
2563 | } | 2562 | } |