diff options
author | randomhuman | 2010-08-13 16:08:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-13 23:29:01 +0100 |
commit | 8eeb3f2fd21c05f0bfd141e333f34c4c69e8865b (patch) | |
tree | 90e2127451904c4e40d3c5382bbc96188ad7e004 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-8eeb3f2fd21c05f0bfd141e333f34c4c69e8865b.zip opensim-SC_OLD-8eeb3f2fd21c05f0bfd141e333f34c4c69e8865b.tar.gz opensim-SC_OLD-8eeb3f2fd21c05f0bfd141e333f34c4c69e8865b.tar.bz2 opensim-SC_OLD-8eeb3f2fd21c05f0bfd141e333f34c4c69e8865b.tar.xz |
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f62851a..18705a8 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -544,45 +544,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
544 | if (m_storageManager.EstateDataStore != null) | 544 | if (m_storageManager.EstateDataStore != null) |
545 | { | 545 | { |
546 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID, false); | 546 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID, false); |
547 | if (m_regInfo.EstateSettings.EstateID == 0) // No record at all | ||
548 | { | ||
549 | MainConsole.Instance.Output("Your region is not part of an estate."); | ||
550 | while (true) | ||
551 | { | ||
552 | string response = MainConsole.Instance.CmdPrompt("Do you wish to join an existing estate?", "no", new List<string>() {"yes", "no"}); | ||
553 | if (response == "no") | ||
554 | { | ||
555 | // Create a new estate | ||
556 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID, true); | ||
557 | |||
558 | m_regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", m_regInfo.EstateSettings.EstateName); | ||
559 | m_regInfo.EstateSettings.Save(); | ||
560 | break; | ||
561 | } | ||
562 | else | ||
563 | { | ||
564 | response = MainConsole.Instance.CmdPrompt("Estate name to join", "None"); | ||
565 | if (response == "None") | ||
566 | continue; | ||
567 | |||
568 | List<int> estateIDs = m_storageManager.EstateDataStore.GetEstates(response); | ||
569 | if (estateIDs.Count < 1) | ||
570 | { | ||
571 | MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again"); | ||
572 | continue; | ||
573 | } | ||
574 | |||
575 | int estateID = estateIDs[0]; | ||
576 | |||
577 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(estateID); | ||
578 | |||
579 | if (m_storageManager.EstateDataStore.LinkRegion(m_regInfo.RegionID, estateID)) | ||
580 | break; | ||
581 | |||
582 | MainConsole.Instance.Output("Joining the estate failed. Please try again."); | ||
583 | } | ||
584 | } | ||
585 | } | ||
586 | } | 547 | } |
587 | 548 | ||
588 | #endregion Region Settings | 549 | #endregion Region Settings |