diff options
author | Adam Frisby | 2008-01-15 02:09:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-01-15 02:09:55 +0000 |
commit | b25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch) | |
tree | 7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Framework/RegionInfo.cs | |
parent | Set svn:eol-style. (diff) | |
download | opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2 opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz |
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's
* Added Copyright headers to a bunch of files missing them
* Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 3c4fcba..8d4e905 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -157,17 +157,17 @@ namespace OpenSim.Framework | |||
157 | 157 | ||
158 | public class RegionInfo : SimpleRegionInfo | 158 | public class RegionInfo : SimpleRegionInfo |
159 | { | 159 | { |
160 | public string RegionName = ""; | 160 | public string RegionName = String.Empty; |
161 | 161 | ||
162 | public string DataStore = ""; | 162 | public string DataStore = String.Empty; |
163 | public bool isSandbox = false; | 163 | public bool isSandbox = false; |
164 | public bool commFailTF = false; | 164 | public bool commFailTF = false; |
165 | 165 | ||
166 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; | 166 | public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; |
167 | public LLUUID CovenantID = LLUUID.Zero; | 167 | public LLUUID CovenantID = LLUUID.Zero; |
168 | public string MasterAvatarFirstName = ""; | 168 | public string MasterAvatarFirstName = String.Empty; |
169 | public string MasterAvatarLastName = ""; | 169 | public string MasterAvatarLastName = String.Empty; |
170 | public string MasterAvatarSandboxPassword = ""; | 170 | public string MasterAvatarSandboxPassword = String.Empty; |
171 | 171 | ||
172 | // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. | 172 | // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. |
173 | private static EstateSettings m_estateSettings; | 173 | private static EstateSettings m_estateSettings; |
@@ -241,7 +241,7 @@ namespace OpenSim.Framework | |||
241 | //not in use, should swap to nini though. | 241 | //not in use, should swap to nini though. |
242 | public void LoadFromNiniSource(IConfigSource source, string sectionName) | 242 | public void LoadFromNiniSource(IConfigSource source, string sectionName) |
243 | { | 243 | { |
244 | string errorMessage = ""; | 244 | string errorMessage = String.Empty; |
245 | RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); | 245 | RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); |
246 | RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); | 246 | RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); |
247 | m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); | 247 | m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); |
@@ -275,7 +275,7 @@ namespace OpenSim.Framework | |||
275 | MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User"); | 275 | MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User"); |
276 | MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test"); | 276 | MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test"); |
277 | 277 | ||
278 | if (errorMessage != "") | 278 | if (errorMessage != String.Empty) |
279 | { | 279 | { |
280 | // a error | 280 | // a error |
281 | } | 281 | } |
@@ -384,7 +384,7 @@ namespace OpenSim.Framework | |||
384 | break; | 384 | break; |
385 | case "master_avatar_pass": | 385 | case "master_avatar_pass": |
386 | string tempMD5Passwd = (string) configuration_result; | 386 | string tempMD5Passwd = (string) configuration_result; |
387 | MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); | 387 | MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); |
388 | break; | 388 | break; |
389 | } | 389 | } |
390 | 390 | ||