aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorlbsa712008-09-08 14:30:35 +0000
committerlbsa712008-09-08 14:30:35 +0000
commit8388fe0669f9d140028d1925284491b21a09a1bf (patch)
tree80c7729bef9b88a371c3f561322a97faf262ade6 /OpenSim/Region/ClientStack
parentMantis #2144 (diff)
downloadopensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.zip
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.gz
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.bz2
opensim-SC_OLD-8388fe0669f9d140028d1925284491b21a09a1bf.tar.xz
* some if inversions and added {}'s for readability
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs25
1 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index d1572fd..dfe922b 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -138,30 +138,31 @@ namespace OpenSim.Region.ClientStack
138 // TODO: Remove this cruft once MasterAvatar is fully deprecated 138 // TODO: Remove this cruft once MasterAvatar is fully deprecated
139 //Master Avatar Setup 139 //Master Avatar Setup
140 UserProfileData masterAvatar; 140 UserProfileData masterAvatar;
141 if (scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero) 141 if (scene.RegionInfo.MasterAvatarAssignedUUID == UUID.Zero)
142 {
143 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
144 scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
145 scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName;
146 }
147 else
148 { 142 {
149 masterAvatar = 143 masterAvatar =
150 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, 144 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
151 scene.RegionInfo.MasterAvatarLastName, 145 scene.RegionInfo.MasterAvatarLastName,
152 scene.RegionInfo.MasterAvatarSandboxPassword); 146 scene.RegionInfo.MasterAvatarSandboxPassword);
153 } 147 }
154 148 else
155 if (masterAvatar != null)
156 { 149 {
157 m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]", scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); 150 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
158 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; 151 scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
152 scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName;
159 } 153 }
160 else 154
155 if (masterAvatar == null)
161 { 156 {
162 m_log.Info("[PARCEL]: No master avatar found, using null."); 157 m_log.Info("[PARCEL]: No master avatar found, using null.");
163 scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero; 158 scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero;
164 } 159 }
160 else
161 {
162 m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]",
163 scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
164 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
165 }
165 166
166 scene.LoadPrimsFromStorage(regionInfo.originRegionID); 167 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
167 scene.StartTimer(); 168 scene.StartTimer();