aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:06:51 +0000
committerlbsa712009-04-17 15:06:51 +0000
commit1759d05cdf9501636b21f1d1ec1f71302006f5a7 (patch)
tree8996957442da971283e21c08f390ef85ca93b74e /OpenSim/Framework
parent* Extend get user profile test to cover retrieval by name (diff)
downloadopensim-SC-1759d05cdf9501636b21f1d1ec1f71302006f5a7.zip
opensim-SC-1759d05cdf9501636b21f1d1ec1f71302006f5a7.tar.gz
opensim-SC-1759d05cdf9501636b21f1d1ec1f71302006f5a7.tar.bz2
opensim-SC-1759d05cdf9501636b21f1d1ec1f71302006f5a7.tar.xz
* remind me to never touch EstateSettings ever again. Ever.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/EstateSettings.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index ec90956..ff0445f 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -43,12 +43,12 @@ namespace OpenSim.Framework
43 43
44 // Only the client uses these 44 // Only the client uses these
45 // 45 //
46 private uint m_EstateId = 100; 46 private uint m_EstateID = 100;
47 47
48 public uint EstateID 48 public uint EstateID
49 { 49 {
50 get { return m_EstateId; } 50 get { return m_EstateID; }
51 set { m_EstateId = value; } 51 set { m_EstateID = value; }
52 } 52 }
53 53
54 private string m_EstateName; 54 private string m_EstateName;
@@ -466,7 +466,7 @@ namespace OpenSim.Framework
466 m_BillableFactor = (float) configuration_result; 466 m_BillableFactor = (float) configuration_result;
467 break; 467 break;
468// case "estate_id": 468// case "estate_id":
469// m_EstateId = (uint) configuration_result; 469// m_EstateID = (uint) configuration_result;
470// break; 470// break;
471// case "parent_estate_id": 471// case "parent_estate_id":
472// m_ParentEstateID = (uint) configuration_result; 472// m_ParentEstateID = (uint) configuration_result;