aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 3e941cf..7a552a6 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -135,11 +135,14 @@ namespace OpenSim.Region.ClientStack
135 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 135 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
136 scene.PhysicsScene.SetWaterLevel((float)regionInfo.RegionSettings.WaterHeight); 136 scene.PhysicsScene.SetWaterLevel((float)regionInfo.RegionSettings.WaterHeight);
137 137
138 // TODO: Remove this cruft once MasterAvatar is fully deprecated
138 //Master Avatar Setup 139 //Master Avatar Setup
139 UserProfileData masterAvatar; 140 UserProfileData masterAvatar;
140 if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) 141 if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
141 { 142 {
142 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); 143 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
144 scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
145 scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName;
143 } 146 }
144 else 147 else
145 { 148 {
@@ -151,7 +154,7 @@ namespace OpenSim.Region.ClientStack
151 154
152 if (masterAvatar != null) 155 if (masterAvatar != null)
153 { 156 {
154 m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.ID.ToString() + "]"); 157 m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]", scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
155 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; 158 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
156 } 159 }
157 else 160 else