diff options
author | Jeff Ames | 2008-08-19 22:41:39 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-19 22:41:39 +0000 |
commit | 07b04213d7fe39fa51ff0b1ce435d66fbed8da36 (patch) | |
tree | a0a948b9437405e6c836d6f14e1624bed9413377 /OpenSim/Region/Environment | |
parent | Fixes the previous commit of llMakeLink for Shared/ (diff) | |
download | opensim-SC_OLD-07b04213d7fe39fa51ff0b1ce435d66fbed8da36.zip opensim-SC_OLD-07b04213d7fe39fa51ff0b1ce435d66fbed8da36.tar.gz opensim-SC_OLD-07b04213d7fe39fa51ff0b1ce435d66fbed8da36.tar.bz2 opensim-SC_OLD-07b04213d7fe39fa51ff0b1ce435d66fbed8da36.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs index 5f0d83d..bf55e7b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs | |||
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory | |||
235 | if (!m_AgentRegions.ContainsKey(agentID)) | 235 | if (!m_AgentRegions.ContainsKey(agentID)) |
236 | return true; | 236 | return true; |
237 | 237 | ||
238 | if(m_AgentRegions[agentID] == scene) | 238 | if (m_AgentRegions[agentID] == scene) |
239 | { | 239 | { |
240 | m_AgentRegions.Remove(agentID); | 240 | m_AgentRegions.Remove(agentID); |
241 | return true; | 241 | return true; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7d55f7e..363d0f8 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -3863,7 +3863,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3863 | public void SetRootAgentScene(LLUUID agentID) | 3863 | public void SetRootAgentScene(LLUUID agentID) |
3864 | { | 3864 | { |
3865 | IInventoryModule inv = RequestModuleInterface<IInventoryModule>(); | 3865 | IInventoryModule inv = RequestModuleInterface<IInventoryModule>(); |
3866 | if(inv == null) | 3866 | if (inv == null) |
3867 | return; | 3867 | return; |
3868 | 3868 | ||
3869 | inv.SetRootAgentScene(agentID, this); | 3869 | inv.SetRootAgentScene(agentID, this); |
@@ -3872,7 +3872,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3872 | public bool NeedSceneCacheClear(LLUUID agentID) | 3872 | public bool NeedSceneCacheClear(LLUUID agentID) |
3873 | { | 3873 | { |
3874 | IInventoryModule inv = RequestModuleInterface<IInventoryModule>(); | 3874 | IInventoryModule inv = RequestModuleInterface<IInventoryModule>(); |
3875 | if(inv == null) | 3875 | if (inv == null) |
3876 | return true; | 3876 | return true; |
3877 | 3877 | ||
3878 | return inv.NeedSceneCacheClear(agentID, this); | 3878 | return inv.NeedSceneCacheClear(agentID, this); |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 4bc5d34..cc70210 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -2014,7 +2014,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2014 | m_scene.NotifyMyCoarseLocationChange(); | 2014 | m_scene.NotifyMyCoarseLocationChange(); |
2015 | // the user may change their profile information in other region, | 2015 | // the user may change their profile information in other region, |
2016 | // so the userinfo in UserProfileCache is not reliable any more, delete it | 2016 | // so the userinfo in UserProfileCache is not reliable any more, delete it |
2017 | if(m_scene.NeedSceneCacheClear(UUID)) | 2017 | if (m_scene.NeedSceneCacheClear(UUID)) |
2018 | m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID); | 2018 | m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID); |
2019 | m_log.InfoFormat("User {0} is going to another region, profile cache removed", UUID); | 2019 | m_log.InfoFormat("User {0} is going to another region, profile cache removed", UUID); |
2020 | } | 2020 | } |