aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/RegionInfo.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs48
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 9b12662..925c5be 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Xml; 32using System.Xml;
33using libsecondlife; 33using OpenMetaverse;
34using Nini.Config; 34using Nini.Config;
35 35
36namespace OpenSim.Framework 36namespace OpenSim.Framework
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
69 protected uint? m_regionLocX; 69 protected uint? m_regionLocX;
70 protected uint? m_regionLocY; 70 protected uint? m_regionLocY;
71 protected uint m_remotingPort; 71 protected uint m_remotingPort;
72 public LLUUID RegionID = LLUUID.Zero; 72 public UUID RegionID = UUID.Zero;
73 public string RemotingAddress; 73 public string RemotingAddress;
74 74
75 public SimpleRegionInfo() 75 public SimpleRegionInfo()
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
105 m_httpPort = ConvertFrom.HttpPort; 105 m_httpPort = ConvertFrom.HttpPort;
106 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 106 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
107 RemotingAddress = ConvertFrom.RemotingAddress; 107 RemotingAddress = ConvertFrom.RemotingAddress;
108 RegionID = LLUUID.Zero; 108 RegionID = UUID.Zero;
109 ServerURI = ConvertFrom.ServerURI; 109 ServerURI = ConvertFrom.ServerURI;
110 } 110 }
111 111
@@ -202,16 +202,16 @@ namespace OpenSim.Framework
202 202
203// public bool m_allow_alternate_ports; 203// public bool m_allow_alternate_ports;
204 204
205 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; 205 public UUID MasterAvatarAssignedUUID = UUID.Zero;
206 public string MasterAvatarFirstName = String.Empty; 206 public string MasterAvatarFirstName = String.Empty;
207 public string MasterAvatarLastName = String.Empty; 207 public string MasterAvatarLastName = String.Empty;
208 public string MasterAvatarSandboxPassword = String.Empty; 208 public string MasterAvatarSandboxPassword = String.Empty;
209 public LLUUID originRegionID = LLUUID.Zero; 209 public UUID originRegionID = UUID.Zero;
210 public string proxyUrl = ""; 210 public string proxyUrl = "";
211 public string RegionName = String.Empty; 211 public string RegionName = String.Empty;
212 public string regionSecret = LLUUID.Random().ToString(); 212 public string regionSecret = UUID.Random().ToString();
213 213
214 public LLUUID lastMapUUID = LLUUID.Zero; 214 public UUID lastMapUUID = UUID.Zero;
215 public string lastMapRefresh = "0"; 215 public string lastMapRefresh = "0";
216 216
217 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 217 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -248,7 +248,7 @@ namespace OpenSim.Framework
248 m_remotingPort = ConvertFrom.RemotingPort; 248 m_remotingPort = ConvertFrom.RemotingPort;
249 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 249 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
250 RemotingAddress = ConvertFrom.RemotingAddress; 250 RemotingAddress = ConvertFrom.RemotingAddress;
251 RegionID = LLUUID.Zero; 251 RegionID = UUID.Zero;
252 proxyUrl = ConvertFrom.ProxyUrl; 252 proxyUrl = ConvertFrom.ProxyUrl;
253 originRegionID = ConvertFrom.OriginRegionID; 253 originRegionID = ConvertFrom.OriginRegionID;
254 RegionName = ConvertFrom.RegionName; 254 RegionName = ConvertFrom.RegionName;
@@ -264,7 +264,7 @@ namespace OpenSim.Framework
264 m_remotingPort = ConvertFrom.RemotingPort; 264 m_remotingPort = ConvertFrom.RemotingPort;
265 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 265 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
266 RemotingAddress = ConvertFrom.RemotingAddress; 266 RemotingAddress = ConvertFrom.RemotingAddress;
267 RegionID = LLUUID.Zero; 267 RegionID = UUID.Zero;
268 ServerURI = ConvertFrom.ServerURI; 268 ServerURI = ConvertFrom.ServerURI;
269 } 269 }
270 270
@@ -315,7 +315,7 @@ namespace OpenSim.Framework
315 public void LoadFromNiniSource(IConfigSource source, string sectionName) 315 public void LoadFromNiniSource(IConfigSource source, string sectionName)
316 { 316 {
317 string errorMessage = String.Empty; 317 string errorMessage = String.Empty;
318 RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); 318 RegionID = new UUID(source.Configs[sectionName].GetString("Region_ID", UUID.Random().ToString()));
319 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); 319 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
320 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); 320 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
321 m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000")); 321 m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
368 368
369 public void loadConfigurationOptionsFromMe() 369 public void loadConfigurationOptionsFromMe()
370 { 370 {
371 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE, 371 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE,
372 "UUID of Region (Default is recommended, random UUID)", 372 "UUID of Region (Default is recommended, random UUID)",
373 RegionID.ToString(), true); 373 RegionID.ToString(), true);
374 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 374 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -393,7 +393,7 @@ namespace OpenSim.Framework
393 configMember.addConfigurationOption("external_host_name", 393 configMember.addConfigurationOption("external_host_name",
394 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 394 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
395 "External Host Name", m_externalHostName, true); 395 "External Host Name", m_externalHostName, true);
396 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 396 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
397 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true); 397 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true);
398 configMember.addConfigurationOption("master_avatar_first", 398 configMember.addConfigurationOption("master_avatar_first",
399 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 399 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -404,7 +404,7 @@ namespace OpenSim.Framework
404 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 404 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
405 "(Sandbox Mode Only)Password for Master Avatar account", 405 "(Sandbox Mode Only)Password for Master Avatar account",
406 MasterAvatarSandboxPassword, true); 406 MasterAvatarSandboxPassword, true);
407 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 407 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
408 "Last Map UUID", lastMapUUID.ToString(), true); 408 "Last Map UUID", lastMapUUID.ToString(), true);
409 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 409 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
410 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); 410 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
@@ -413,9 +413,9 @@ namespace OpenSim.Framework
413 413
414 public void loadConfigurationOptions() 414 public void loadConfigurationOptions()
415 { 415 {
416 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 416 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
417 "UUID of Region (Default is recommended, random UUID)", 417 "UUID of Region (Default is recommended, random UUID)",
418 LLUUID.Random().ToString(), true); 418 UUID.Random().ToString(), true);
419 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 419 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
420 "Region Name", "OpenSim Test", false); 420 "Region Name", "OpenSim Test", false);
421 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 421 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
@@ -436,8 +436,8 @@ namespace OpenSim.Framework
436 configMember.addConfigurationOption("external_host_name", 436 configMember.addConfigurationOption("external_host_name",
437 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 437 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
438 "External Host Name", "127.0.0.1", false); 438 "External Host Name", "127.0.0.1", false);
439 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 439 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
440 "Master Avatar UUID", LLUUID.Zero.ToString(), true); 440 "Master Avatar UUID", UUID.Zero.ToString(), true);
441 configMember.addConfigurationOption("master_avatar_first", 441 configMember.addConfigurationOption("master_avatar_first",
442 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 442 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
443 "First Name of Master Avatar", "Test", false, 443 "First Name of Master Avatar", "Test", false,
@@ -452,7 +452,7 @@ namespace OpenSim.Framework
452 "(Sandbox Mode Only)Password for Master Avatar account", "test", false, 452 "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
453 (ConfigurationOption.ConfigurationOptionShouldBeAsked) 453 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
454 shouldMasterAvatarDetailsBeAsked); 454 shouldMasterAvatarDetailsBeAsked);
455 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 455 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
456 "Last Map UUID", lastMapUUID.ToString(), true); 456 "Last Map UUID", lastMapUUID.ToString(), true);
457 457
458 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 458 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -461,7 +461,7 @@ namespace OpenSim.Framework
461 461
462 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 462 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
463 { 463 {
464 return MasterAvatarAssignedUUID == LLUUID.Zero; 464 return MasterAvatarAssignedUUID == UUID.Zero;
465 } 465 }
466 466
467 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 467 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -469,8 +469,8 @@ namespace OpenSim.Framework
469 switch (configuration_key) 469 switch (configuration_key)
470 { 470 {
471 case "sim_UUID": 471 case "sim_UUID":
472 RegionID = (LLUUID) configuration_result; 472 RegionID = (UUID) configuration_result;
473 originRegionID = (LLUUID) configuration_result; 473 originRegionID = (UUID) configuration_result;
474 break; 474 break;
475 case "sim_name": 475 case "sim_name":
476 RegionName = (string) configuration_result; 476 RegionName = (string) configuration_result;
@@ -505,7 +505,7 @@ namespace OpenSim.Framework
505 } 505 }
506 break; 506 break;
507 case "master_avatar_uuid": 507 case "master_avatar_uuid":
508 MasterAvatarAssignedUUID = (LLUUID) configuration_result; 508 MasterAvatarAssignedUUID = (UUID) configuration_result;
509 break; 509 break;
510 case "master_avatar_first": 510 case "master_avatar_first":
511 MasterAvatarFirstName = (string) configuration_result; 511 MasterAvatarFirstName = (string) configuration_result;
@@ -518,7 +518,7 @@ namespace OpenSim.Framework
518 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 518 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
519 break; 519 break;
520 case "lastmap_uuid": 520 case "lastmap_uuid":
521 lastMapUUID = (LLUUID)configuration_result; 521 lastMapUUID = (UUID)configuration_result;
522 break; 522 break;
523 case "lastmap_refresh": 523 case "lastmap_refresh":
524 lastMapRefresh = (string)configuration_result; 524 lastMapRefresh = (string)configuration_result;
@@ -528,7 +528,7 @@ namespace OpenSim.Framework
528 return true; 528 return true;
529 } 529 }
530 530
531 public void SaveLastMapUUID(LLUUID mapUUID) 531 public void SaveLastMapUUID(UUID mapUUID)
532 { 532 {
533 if (null == configMember) return; 533 if (null == configMember) return;
534 534