aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:09:37 +0000
committerlbsa712009-04-17 15:09:37 +0000
commita189da844a1ec48b321674f49a81c4e0a71c8b81 (patch)
treeeb55b24007c0f221a7d9f84bdbb12282d161c777 /OpenSim/Region
parent* remind me to never touch EstateSettings ever again. Ever. (diff)
downloadopensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs12
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
5 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index f609cc5..fea3e94 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -252,16 +252,16 @@ namespace OpenSim
252 252
253 config.Set("default_location_x", 1000); 253 config.Set("default_location_x", 1000);
254 config.Set("default_location_y", 1000); 254 config.Set("default_location_y", 1000);
255 config.Set("http_listener_port", DefaultSettings.DefaultRegionHttpPort); 255 config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort);
256 config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort); 256 config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort);
257 config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); 257 config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
258 config.Set("grid_send_key", "null"); 258 config.Set("grid_send_key", "null");
259 config.Set("grid_recv_key", "null"); 259 config.Set("grid_recv_key", "null");
260 config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); 260 config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
261 config.Set("user_send_key", "null"); 261 config.Set("user_send_key", "null");
262 config.Set("user_recv_key", "null"); 262 config.Set("user_recv_key", "null");
263 config.Set("asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString()); 263 config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString());
264 config.Set("inventory_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort.ToString()); 264 config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString());
265 config.Set("secure_inventory_server", "true"); 265 config.Set("secure_inventory_server", "true");
266 } 266 }
267 267
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 05dd8e1..fc3a134 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -552,7 +552,7 @@ namespace OpenSim.Region.Communications.Hypergrid
552 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); 552 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
553 hash["region_name"] = regInfo.RegionName; 553 hash["region_name"] = regInfo.RegionName;
554 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); 554 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
555 hash["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); 555 hash["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
556 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); 556 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
557 557
558 558
@@ -640,7 +640,7 @@ namespace OpenSim.Region.Communications.Hypergrid
640 m_log.Debug(" >> " + loginParams["home_address"] + " <<"); 640 m_log.Debug(" >> " + loginParams["home_address"] + " <<");
641 m_log.Debug(" --------- ------------ -------"); 641 m_log.Debug(" --------- ------------ -------");
642 loginParams["home_port"] = rinfo.HttpPort.ToString(); 642 loginParams["home_port"] = rinfo.HttpPort.ToString();
643 loginParams["home_remoting"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ; 643 loginParams["home_remoting"] = ConfigSettings.DefaultRegionRemotingPort.ToString(); ;
644 } 644 }
645 } 645 }
646 else 646 else
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index aae5d83..27b20ef 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
119 GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); 119 GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
120 GridParams["sim_name"] = regionInfo.RegionName; 120 GridParams["sim_name"] = regionInfo.RegionName;
121 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); 121 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
122 GridParams["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); 122 GridParams["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
123 GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString(); 123 GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
124 GridParams["originUUID"] = regionInfo.originRegionID.ToString(); 124 GridParams["originUUID"] = regionInfo.originRegionID.ToString();
125 GridParams["server_uri"] = regionInfo.ServerURI; 125 GridParams["server_uri"] = regionInfo.ServerURI;
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 9a768ac..fd5c142 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
64 64
65 //DataServices and networking 65 //DataServices and networking
66 private string m_dataServices = "noservices"; 66 private string m_dataServices = "noservices";
67 public string m_listener_port = DefaultSettings.DefaultRegionHttpPort.ToString(); 67 public string m_listener_port = ConfigSettings.DefaultRegionHttpPort.ToString();
68 public string m_hostname = "127.0.0.1"; 68 public string m_hostname = "127.0.0.1";
69 69
70 //Update timers 70 //Update timers
@@ -106,15 +106,15 @@ namespace OpenSim.Region.DataSnapshot
106 m_gridinfo.Add( 106 m_gridinfo.Add(
107 "gridserverURL", 107 "gridserverURL",
108 config.Configs["Network"].GetString( 108 config.Configs["Network"].GetString(
109 "grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString())); 109 "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()));
110 m_gridinfo.Add( 110 m_gridinfo.Add(
111 "userserverURL", 111 "userserverURL",
112 config.Configs["Network"].GetString( 112 config.Configs["Network"].GetString(
113 "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString())); 113 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()));
114 m_gridinfo.Add( 114 m_gridinfo.Add(
115 "assetserverURL", 115 "assetserverURL",
116 config.Configs["Network"].GetString( 116 config.Configs["Network"].GetString(
117 "asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString())); 117 "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()));
118 } 118 }
119 119
120 m_gridinfo.Add( 120 m_gridinfo.Add(
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c120b24..cc43d08 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8808,7 +8808,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8808 { 8808 {
8809 shard 8809 shard
8810 = config.Configs["Network"].GetString( 8810 = config.Configs["Network"].GetString(
8811 "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); 8811 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
8812 shard = config.Configs["Network"].GetString("shard", shard); 8812 shard = config.Configs["Network"].GetString("shard", shard);
8813 } 8813 }
8814 8814