diff options
author | Jeff Ames | 2008-03-18 05:16:43 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-18 05:16:43 +0000 |
commit | 47180080f0f4b93c60232b47ca4e093bd7c73a1d (patch) | |
tree | 780f51135995bb4be311e6f2b331cfa5c4b16d9d /OpenSim/Framework/EstateSettings.cs | |
parent | Added copyright messages. Set svn:eol-style. Minor cleanup. (diff) | |
download | opensim-SC_OLD-47180080f0f4b93c60232b47ca4e093bd7c73a1d.zip opensim-SC_OLD-47180080f0f4b93c60232b47ca4e093bd7c73a1d.tar.gz opensim-SC_OLD-47180080f0f4b93c60232b47ca4e093bd7c73a1d.tar.bz2 opensim-SC_OLD-47180080f0f4b93c60232b47ca4e093bd7c73a1d.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 70 |
1 files changed, 32 insertions, 38 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 26924eb..8bf3639 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -1,30 +1,30 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | */ |
27 | */ | 27 | |
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using libsecondlife; | 30 | using libsecondlife; |
@@ -49,7 +49,6 @@ namespace OpenSim.Framework | |||
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | |||
53 | private uint m_estateID; | 52 | private uint m_estateID; |
54 | 53 | ||
55 | public uint estateID | 54 | public uint estateID |
@@ -62,7 +61,6 @@ namespace OpenSim.Framework | |||
62 | } | 61 | } |
63 | } | 62 | } |
64 | 63 | ||
65 | |||
66 | private uint m_parentEstateID; | 64 | private uint m_parentEstateID; |
67 | 65 | ||
68 | public uint parentEstateID | 66 | public uint parentEstateID |
@@ -135,7 +133,6 @@ namespace OpenSim.Framework | |||
135 | } | 133 | } |
136 | } | 134 | } |
137 | 135 | ||
138 | |||
139 | private Simulator.SimAccess m_simAccess; | 136 | private Simulator.SimAccess m_simAccess; |
140 | 137 | ||
141 | public Simulator.SimAccess simAccess | 138 | public Simulator.SimAccess simAccess |
@@ -196,7 +193,6 @@ namespace OpenSim.Framework | |||
196 | } | 193 | } |
197 | } | 194 | } |
198 | 195 | ||
199 | |||
200 | private int m_pricePerMeter; | 196 | private int m_pricePerMeter; |
201 | 197 | ||
202 | public int pricePerMeter | 198 | public int pricePerMeter |
@@ -506,7 +502,6 @@ namespace OpenSim.Framework | |||
506 | get { | 502 | get { |
507 | // returns a condensed array of LLUUIDs | 503 | // returns a condensed array of LLUUIDs |
508 | return GetEstateManagers(); | 504 | return GetEstateManagers(); |
509 | |||
510 | } | 505 | } |
511 | set | 506 | set |
512 | { | 507 | { |
@@ -547,8 +542,8 @@ namespace OpenSim.Framework | |||
547 | m_estateManager9 = value[i]; | 542 | m_estateManager9 = value[i]; |
548 | break; | 543 | break; |
549 | } | 544 | } |
550 | |||
551 | } | 545 | } |
546 | |||
552 | // Clear the rest of them.. as they're no longer valid | 547 | // Clear the rest of them.. as they're no longer valid |
553 | for (int j = i; j < 10; j++) | 548 | for (int j = i; j < 10; j++) |
554 | { | 549 | { |
@@ -586,17 +581,15 @@ namespace OpenSim.Framework | |||
586 | break; | 581 | break; |
587 | } | 582 | } |
588 | } | 583 | } |
584 | |||
589 | for (i = 0; i < 10; i++) | 585 | for (i = 0; i < 10; i++) |
590 | { | 586 | { |
591 | // Writes out the Estate managers to the XML file. | 587 | // Writes out the Estate managers to the XML file. |
592 | configMember.forceSetConfigurationOption("estate_manager_" + i, (GetEstateManagerAtPos(i)).ToString()); | 588 | configMember.forceSetConfigurationOption("estate_manager_" + i, (GetEstateManagerAtPos(i)).ToString()); |
593 | |||
594 | } | 589 | } |
595 | } | 590 | } |
596 | } | 591 | } |
597 | 592 | ||
598 | |||
599 | |||
600 | #region EstateManager Get Methods to sort out skipped spots in the XML (suser error) | 593 | #region EstateManager Get Methods to sort out skipped spots in the XML (suser error) |
601 | 594 | ||
602 | private LLUUID GetEstateManagerAtPos(int pos) | 595 | private LLUUID GetEstateManagerAtPos(int pos) |
@@ -639,6 +632,7 @@ namespace OpenSim.Framework | |||
639 | 632 | ||
640 | } | 633 | } |
641 | } | 634 | } |
635 | |||
642 | private LLUUID[] GetEstateManagers() | 636 | private LLUUID[] GetEstateManagers() |
643 | { | 637 | { |
644 | int numEstateManagers = GetNumberOfEstateManagers(); | 638 | int numEstateManagers = GetNumberOfEstateManagers(); |
@@ -667,6 +661,7 @@ namespace OpenSim.Framework | |||
667 | return i; | 661 | return i; |
668 | 662 | ||
669 | } | 663 | } |
664 | |||
670 | private int GetNumberOfEstateManagers() | 665 | private int GetNumberOfEstateManagers() |
671 | { | 666 | { |
672 | // This function returns the number of estate managers set | 667 | // This function returns the number of estate managers set |
@@ -703,6 +698,7 @@ namespace OpenSim.Framework | |||
703 | estateManagers = nestateManagers; | 698 | estateManagers = nestateManagers; |
704 | 699 | ||
705 | } | 700 | } |
701 | |||
706 | public void RemoveEstateManager(LLUUID avatarID) | 702 | public void RemoveEstateManager(LLUUID avatarID) |
707 | { | 703 | { |
708 | int notfoundparam = 11; // starting high so the condense routine (max ten) doesn't run if we don't find it. | 704 | int notfoundparam = 11; // starting high so the condense routine (max ten) doesn't run if we don't find it. |
@@ -859,7 +855,6 @@ namespace OpenSim.Framework | |||
859 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 855 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
860 | configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 856 | configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, |
861 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 857 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
862 | |||
863 | } | 858 | } |
864 | 859 | ||
865 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 860 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -1012,10 +1007,9 @@ namespace OpenSim.Framework | |||
1012 | case "estate_manager_9": | 1007 | case "estate_manager_9": |
1013 | m_estateManager9 = (LLUUID)configuration_result; | 1008 | m_estateManager9 = (LLUUID)configuration_result; |
1014 | break; | 1009 | break; |
1015 | |||
1016 | } | 1010 | } |
1017 | 1011 | ||
1018 | return true; | 1012 | return true; |
1019 | } | 1013 | } |
1020 | } | 1014 | } |
1021 | } \ No newline at end of file | 1015 | } |