diff options
author | Jeff Ames | 2008-11-21 18:44:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-11-21 18:44:48 +0000 |
commit | ecac5c9c5a18241c62a25834b20be38ee0e38843 (patch) | |
tree | a0a0678b8060d69cf01f9cba8f661fc856105142 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Largely revert the last revision and improve on the previous way of doing t... (diff) | |
download | opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.zip opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.tar.gz opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.tar.bz2 opensim-SC_OLD-ecac5c9c5a18241c62a25834b20be38ee0e38843.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 741c47e..221af44 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -966,7 +966,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
966 | /// <returns></returns> | 966 | /// <returns></returns> |
967 | public void Backup() | 967 | public void Backup() |
968 | { | 968 | { |
969 | lock(m_returns) | 969 | lock (m_returns) |
970 | { | 970 | { |
971 | EventManager.TriggerOnBackup(m_storageManager.DataStore); | 971 | EventManager.TriggerOnBackup(m_storageManager.DataStore); |
972 | m_backingup = false; | 972 | m_backingup = false; |
@@ -1003,7 +1003,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1003 | 1003 | ||
1004 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) | 1004 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) |
1005 | { | 1005 | { |
1006 | lock(m_returns) | 1006 | lock (m_returns) |
1007 | { | 1007 | { |
1008 | if (m_returns.ContainsKey(agentID)) | 1008 | if (m_returns.ContainsKey(agentID)) |
1009 | { | 1009 | { |
@@ -2428,7 +2428,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2428 | if (regionInfo == null) | 2428 | if (regionInfo == null) |
2429 | { | 2429 | { |
2430 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); | 2430 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); |
2431 | if(regionInfo != null) // home region can be away temporarily, too | 2431 | if (regionInfo != null) // home region can be away temporarily, too |
2432 | { | 2432 | { |
2433 | UserProfile.HomeRegionID = regionInfo.RegionID; | 2433 | UserProfile.HomeRegionID = regionInfo.RegionID; |
2434 | CommsManager.UserService.UpdateUserProfile(UserProfile); | 2434 | CommsManager.UserService.UpdateUserProfile(UserProfile); |