aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-14 02:39:27 +0000
committerTeravus Ovares2008-06-14 02:39:27 +0000
commit6bea792436521c1635eed73a002975f4334c9354 (patch)
treeb4a443457851d845f82e93c577e04ce9e85e4660 /OpenSim/Framework
parentsave_assets_to_file path shouldn't always assume uploaded (diff)
downloadopensim-SC_OLD-6bea792436521c1635eed73a002975f4334c9354.zip
opensim-SC_OLD-6bea792436521c1635eed73a002975f4334c9354.tar.gz
opensim-SC_OLD-6bea792436521c1635eed73a002975f4334c9354.tar.bz2
opensim-SC_OLD-6bea792436521c1635eed73a002975f4334c9354.tar.xz
* Enables maptile display in grid mode for simulators that are not on the same instance.
* Only generates a new maptile after a refresh interval * Maptile names have the UnixTimeSinceEpoch that they were generated and the regionUUID they're from, so you can know which ones are no longer necessary. * Updates RegionInfo, so backup your /bin/Region/*.xml files.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs28
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 9c27891..979ced5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -208,6 +208,9 @@ namespace OpenSim.Framework
208 public string RegionName = String.Empty; 208 public string RegionName = String.Empty;
209 public string regionSecret = LLUUID.Random().ToString(); 209 public string regionSecret = LLUUID.Random().ToString();
210 210
211 public LLUUID lastMapUUID = LLUUID.Zero;
212 public string lastMapRefresh = "0";
213
211 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 214 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
212 215
213 public RegionInfo(string description, string filename, bool skipConsoleConfig) 216 public RegionInfo(string description, string filename, bool skipConsoleConfig)
@@ -384,6 +387,11 @@ namespace OpenSim.Framework
384 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 387 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
385 "(Sandbox Mode Only)Password for Master Avatar account", 388 "(Sandbox Mode Only)Password for Master Avatar account",
386 MasterAvatarSandboxPassword, true); 389 MasterAvatarSandboxPassword, true);
390 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
391 "Last Map UUID", lastMapUUID.ToString(), true);
392 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
393 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
394
387 } 395 }
388 396
389 public void loadConfigurationOptions() 397 public void loadConfigurationOptions()
@@ -430,6 +438,12 @@ namespace OpenSim.Framework
430 "(Sandbox Mode Only)Password for Master Avatar account", "test", false, 438 "(Sandbox Mode Only)Password for Master Avatar account", "test", false,
431 (ConfigurationOption.ConfigurationOptionShouldBeAsked) 439 (ConfigurationOption.ConfigurationOptionShouldBeAsked)
432 shouldMasterAvatarDetailsBeAsked); 440 shouldMasterAvatarDetailsBeAsked);
441 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
442 "Last Map UUID", lastMapUUID.ToString(), true);
443
444 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
445 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
446
433 } 447 }
434 448
435 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 449 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
@@ -498,6 +512,12 @@ namespace OpenSim.Framework
498 string tempMD5Passwd = (string) configuration_result; 512 string tempMD5Passwd = (string) configuration_result;
499 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 513 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
500 break; 514 break;
515 case "lastmap_uuid":
516 lastMapUUID = (LLUUID)configuration_result;
517 break;
518 case "lastmap_refresh":
519 lastMapRefresh = (string)configuration_result;
520 break;
501 } 521 }
502 522
503 return true; 523 return true;
@@ -507,5 +527,13 @@ namespace OpenSim.Framework
507 { 527 {
508 configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString()); 528 configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString());
509 } 529 }
530 public void SaveLastMapUUID(LLUUID mapUUID)
531 {
532 lastMapUUID = mapUUID;
533 lastMapRefresh = Util.UnixTimeSinceEpoch().ToString();
534
535 configMember.forceSetConfigurationOption("lastmap_uuid", mapUUID.ToString());
536 configMember.forceSetConfigurationOption("lastmap_refresh", lastMapRefresh);
537 }
510 } 538 }
511} \ No newline at end of file 539} \ No newline at end of file