aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authormingchen2007-11-03 17:49:45 +0000
committermingchen2007-11-03 17:49:45 +0000
commitb51a900bebe914650c1c7db7b77f74c5ac107f6d (patch)
treeb93c86b110df48df3c17823358fc2e2185319e0b /OpenSim/Region
parent* Removed unused UDPServerBase (diff)
downloadopensim-SC_OLD-b51a900bebe914650c1c7db7b77f74c5ac107f6d.zip
opensim-SC_OLD-b51a900bebe914650c1c7db7b77f74c5ac107f6d.tar.gz
opensim-SC_OLD-b51a900bebe914650c1c7db7b77f74c5ac107f6d.tar.bz2
opensim-SC_OLD-b51a900bebe914650c1c7db7b77f74c5ac107f6d.tar.xz
*Master Avatar can be specified by a previous UUID in either grid mode or standalone mode by specifying a master_avatar_uuid attribute in the place of master_avatar_xxxx_name and master_avatar_password.You will not be asked for the name and password if a valid UUID is specified.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs13
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs10
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs10
3 files changed, 31 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 7551bff..6071dcd 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -113,10 +113,19 @@ namespace OpenSim.Region.ClientStack
113 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); 113 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
114 114
115 //Master Avatar Setup 115 //Master Avatar Setup
116 UserProfileData masterAvatar = 116 UserProfileData masterAvatar;
117 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, 117 if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
118 {
119 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
120 }
121 else
122 {
123 masterAvatar =
124 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
118 scene.RegionInfo.MasterAvatarLastName, 125 scene.RegionInfo.MasterAvatarLastName,
119 scene.RegionInfo.MasterAvatarSandboxPassword); 126 scene.RegionInfo.MasterAvatarSandboxPassword);
127 }
128
120 if (masterAvatar != null) 129 if (masterAvatar != null)
121 { 130 {
122 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); 131 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index a7687c7..d8c4b1d 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -81,5 +81,15 @@ namespace OpenSim.Region.Communications.Local
81 81
82 return profile; 82 return profile;
83 } 83 }
84
85 public override UserProfileData SetupMasterUser(libsecondlife.LLUUID uuid)
86 {
87 UserProfileData data = GetUserProfile(uuid);
88 if (data == null)
89 {
90 throw new Exception("Unknown master user UUID");
91 }
92 return data;
93 }
84 } 94 }
85} \ No newline at end of file 95} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index d00a813..990998e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -145,6 +145,16 @@ namespace OpenSim.Region.Communications.OGS1
145 return profile; 145 return profile;
146 } 146 }
147 147
148 public UserProfileData SetupMasterUser(libsecondlife.LLUUID uuid)
149 {
150 UserProfileData data = GetUserProfile(uuid);
151 if (data == null)
152 {
153 throw new Exception("Unknown master user UUID");
154 }
155 return data;
156 }
157
148 public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) 158 public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
149 { 159 {
150 throw new Exception("The method or operation is not implemented."); 160 throw new Exception("The method or operation is not implemented.");