aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-03 23:46:43 +0000
committerTeravus Ovares2008-01-03 23:46:43 +0000
commit0c555883d55d6ec8ef4f567b66b137958311727d (patch)
tree974a07955407e4bff744a097479c477507ac6435
parentTweaked "show users" formatting, added user's IP address to display. (diff)
downloadopensim-SC_OLD-0c555883d55d6ec8ef4f567b66b137958311727d.zip
opensim-SC_OLD-0c555883d55d6ec8ef4f567b66b137958311727d.tar.gz
opensim-SC_OLD-0c555883d55d6ec8ef4f567b66b137958311727d.tar.bz2
opensim-SC_OLD-0c555883d55d6ec8ef4f567b66b137958311727d.tar.xz
* Made covenant changes made in the estate tools persist across sim restarts.
-rw-r--r--OpenSim/Framework/RegionInfo.cs5
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs3
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8c25603..17811cd 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -390,5 +390,10 @@ namespace OpenSim.Framework
390 390
391 return true; 391 return true;
392 } 392 }
393 public void SaveEstatecovenantUUID(LLUUID notecard)
394 {
395 configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString());
396
397 }
393 } 398 }
394} \ No newline at end of file 399} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 9fe11fc..06c2750 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -477,7 +477,7 @@ namespace OpenSim.Region.Environment
477 foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) 477 foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
478 { 478 {
479 float timeSeconds = 0; 479 float timeSeconds = 0;
480 timeSeconds = BitConverter.ToInt16(block.Parameter, 1); 480 timeSeconds = BitConverter.ToInt32(block.Parameter, 1);
481 timeSeconds = (int) ((timeSeconds/100) - 3); 481 timeSeconds = (int) ((timeSeconds/100) - 3);
482 m_scene.Restart(timeSeconds); 482 m_scene.Restart(timeSeconds);
483 } 483 }
@@ -489,6 +489,7 @@ namespace OpenSim.Region.Environment
489 { 489 {
490 LLUUID newCovenantID = new LLUUID(Helpers.FieldToUTF8String(block.Parameter)); 490 LLUUID newCovenantID = new LLUUID(Helpers.FieldToUTF8String(block.Parameter));
491 m_regInfo.CovenantID = newCovenantID; 491 m_regInfo.CovenantID = newCovenantID;
492 m_scene.RegionInfo.SaveEstatecovenantUUID(newCovenantID);
492 } 493 }
493 } 494 }
494 495