aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/GridConfig.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-04-29 14:04:55 +0000
committerAdam Frisby2008-04-29 14:04:55 +0000
commit375163a6fece8b3a57c7555246abe8338223a599 (patch)
tree163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/GridConfig.cs
parentPatch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff)
downloadopensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.zip
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.gz
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.xz
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/GridConfig.cs29
1 files changed, 12 insertions, 17 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 7ccd0c4..f0cf91f 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -31,27 +31,22 @@ namespace OpenSim.Framework
31{ 31{
32 public class GridConfig 32 public class GridConfig
33 { 33 {
34 public string GridOwner = String.Empty;
35 public string DefaultAssetServer = String.Empty;
36 public string AssetSendKey = String.Empty;
37 public string AssetRecvKey = String.Empty;
38
39 public string DefaultUserServer = String.Empty;
40 public string UserSendKey = String.Empty;
41 public string UserRecvKey = String.Empty;
42
43 public string SimSendKey = String.Empty;
44 public string SimRecvKey = String.Empty;
45
46 public string DatabaseProvider = String.Empty;
47
48
49 public static uint DefaultHttpPort = 8001; 34 public static uint DefaultHttpPort = 8001;
50 public uint HttpPort = DefaultHttpPort;
51 35
52 public string AllowForcefulBanlines = "TRUE"; 36 public string AllowForcefulBanlines = "TRUE";
37 public string AssetRecvKey = String.Empty;
38 public string AssetSendKey = String.Empty;
53 39
54 private ConfigurationMember configMember; 40 private ConfigurationMember configMember;
41 public string DatabaseProvider = String.Empty;
42 public string DefaultAssetServer = String.Empty;
43 public string DefaultUserServer = String.Empty;
44 public string GridOwner = String.Empty;
45 public uint HttpPort = DefaultHttpPort;
46 public string SimRecvKey = String.Empty;
47 public string SimSendKey = String.Empty;
48 public string UserRecvKey = String.Empty;
49 public string UserSendKey = String.Empty;
55 50
56 public GridConfig(string description, string filename) 51 public GridConfig(string description, string filename)
57 { 52 {
@@ -144,4 +139,4 @@ namespace OpenSim.Framework
144 return true; 139 return true;
145 } 140 }
146 } 141 }
147} 142} \ No newline at end of file