aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-19 20:39:30 +0000
committerJustin Clarke Casey2008-09-19 20:39:30 +0000
commit7eb3b5a578065dbab49e3b61f058402ea9336ca9 (patch)
tree2cd6ae875886f3bc1f928c3a89c94fa6fa1aa5ce /OpenSim
parent* Enables logins to regions on a grid once they have finished starting up (th... (diff)
downloadopensim-SC_OLD-7eb3b5a578065dbab49e3b61f058402ea9336ca9.zip
opensim-SC_OLD-7eb3b5a578065dbab49e3b61f058402ea9336ca9.tar.gz
opensim-SC_OLD-7eb3b5a578065dbab49e3b61f058402ea9336ca9.tar.bz2
opensim-SC_OLD-7eb3b5a578065dbab49e3b61f058402ea9336ca9.tar.xz
* minor: eliminate the current warnings
* you'd think from all this that I was one of those fanatically tidy people. I can assure you from looking around my bedroom/study that this is not the case :)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 42266ce..18a0baf 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -45,7 +45,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
45 public class RestAppearanceServices : IRest 45 public class RestAppearanceServices : IRest
46 { 46 {
47 private static readonly int PARM_USERID = 0; 47 private static readonly int PARM_USERID = 0;
48 private static readonly int PARM_PATH = 1; 48 //private static readonly int PARM_PATH = 1;
49 49
50 private bool enabled = false; 50 private bool enabled = false;
51 private string qPrefix = "appearance"; 51 private string qPrefix = "appearance";
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 0462427..2df129b 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -253,7 +253,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
253 253
254 LLSDMap responseMap = new LLSDMap(); 254 LLSDMap responseMap = new LLSDMap();
255 string rezHttpProtocol = "http://"; 255 string rezHttpProtocol = "http://";
256 string regionCapsHttpProtocol = "http://"; 256 //string regionCapsHttpProtocol = "http://";
257 string httpaddr = reg.ExternalHostName; 257 string httpaddr = reg.ExternalHostName;
258 string urlport = reg.HttpPort.ToString(); 258 string urlport = reg.HttpPort.ToString();
259 string requestpath = "/agent/" + UUID.Zero + "/rez_avatar/request"; 259 string requestpath = "/agent/" + UUID.Zero + "/rez_avatar/request";
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
261 if (httpSSL) 261 if (httpSSL)
262 { 262 {
263 rezHttpProtocol = "https://"; 263 rezHttpProtocol = "https://";
264 regionCapsHttpProtocol = "https://"; 264 //regionCapsHttpProtocol = "https://";
265 urlport = httpsslport.ToString(); 265 urlport = httpsslport.ToString();
266 266
267 if (httpsCN.Length > 0) 267 if (httpsCN.Length > 0)