diff options
author | Teravus Ovares | 2008-04-03 22:59:38 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-03 22:59:38 +0000 |
commit | 7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5 (patch) | |
tree | 56ca3618518fa8e876d23f1545fe9505580e3ccf /OpenSim/Framework | |
parent | move NullStorage => OpenSim.Data.Null to be consistant with (diff) | |
download | opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.zip opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.tar.gz opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.tar.bz2 opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.tar.xz |
* Fixes Region/Estate panel in current Linden Official client.
* Sets the default estate parentID to 1.. which means that all regions are treated like private estates in the client as opposed to Linden Mainland. (no space server hiccup message). If that message annoys you and you want to get rid of it, set your parentEstateID to 1.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 8bf3639..f27c1c3 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -547,7 +547,7 @@ namespace OpenSim.Framework | |||
547 | // Clear the rest of them.. as they're no longer valid | 547 | // Clear the rest of them.. as they're no longer valid |
548 | for (int j = i; j < 10; j++) | 548 | for (int j = i; j < 10; j++) |
549 | { | 549 | { |
550 | switch (i) | 550 | switch (j) |
551 | { | 551 | { |
552 | case 0: | 552 | case 0: |
553 | m_estateManager0 = LLUUID.Zero; | 553 | m_estateManager0 = LLUUID.Zero; |
@@ -757,10 +757,10 @@ namespace OpenSim.Framework | |||
757 | { | 757 | { |
758 | configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, | 758 | configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, |
759 | "0.0", true); | 759 | "0.0", true); |
760 | configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0", | 760 | configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "100", |
761 | true); | 761 | true); |
762 | configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 762 | configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
763 | String.Empty, "0", true); | 763 | String.Empty, "1", true); |
764 | configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40", | 764 | configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40", |
765 | true); | 765 | true); |
766 | 766 | ||