aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-27 17:41:42 +0000
committerTeravus Ovares2008-02-27 17:41:42 +0000
commit34073607a2e3a0c2452603a48c3ab8d45aee8f3f (patch)
treef97ac0a768f0dac9d7cf26468f17d8731528c8bb /OpenSim/Region/Environment/Scenes/Scene.cs
parentanother attempt at fixing asset lockups (diff)
downloadopensim-SC_OLD-34073607a2e3a0c2452603a48c3ab8d45aee8f3f.zip
opensim-SC_OLD-34073607a2e3a0c2452603a48c3ab8d45aee8f3f.tar.gz
opensim-SC_OLD-34073607a2e3a0c2452603a48c3ab8d45aee8f3f.tar.bz2
opensim-SC_OLD-34073607a2e3a0c2452603a48c3ab8d45aee8f3f.tar.xz
* Turned Friends Module into a shared module (to comply with Scene.AddXmlRPCHandler being shared).
* Fixed a null ref issue in Scene.Close()
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 32136be..f6e3d82 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1466,7 +1466,12 @@ namespace OpenSim.Region.Environment.Scenes
1466 /// <param name="agentID"></param> 1466 /// <param name="agentID"></param>
1467 public override void RemoveClient(LLUUID agentID) 1467 public override void RemoveClient(LLUUID agentID)
1468 { 1468 {
1469 bool childagentYN = false;
1469 ScenePresence avatar = GetScenePresence(agentID); 1470 ScenePresence avatar = GetScenePresence(agentID);
1471 if (avatar != null)
1472 {
1473 childagentYN = avatar.IsChildAgent;
1474 }
1470 try 1475 try
1471 { 1476 {
1472 if (avatar.IsChildAgent) 1477 if (avatar.IsChildAgent)
@@ -1555,7 +1560,7 @@ namespace OpenSim.Region.Environment.Scenes
1555 } 1560 }
1556 1561
1557 // Remove client agent from profile, so new logins will work 1562 // Remove client agent from profile, so new logins will work
1558 if (!avatar.IsChildAgent) 1563 if (!childagentYN)
1559 { 1564 {
1560 m_sceneGridService.ClearUserAgent(agentID); 1565 m_sceneGridService.ClearUserAgent(agentID);
1561 } 1566 }