aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-05-27 06:30:23 +0100
committerUbitUmarov2017-05-27 06:30:23 +0100
commit582dc75381a2d8eff4a231cb5fce5889602f57c8 (patch)
tree2590d818741b85bb972690f75593d7b12aed83c1
parentMerge branch 'master' into httptests (diff)
downloadopensim-SC-582dc75381a2d8eff4a231cb5fce5889602f57c8.zip
opensim-SC-582dc75381a2d8eff4a231cb5fce5889602f57c8.tar.gz
opensim-SC-582dc75381a2d8eff4a231cb5fce5889602f57c8.tar.bz2
opensim-SC-582dc75381a2d8eff4a231cb5fce5889602f57c8.tar.xz
remove a accent from a method name
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/MainServer.cs2
-rw-r--r--OpenSim/Region/Application/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs4
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 7ecd383..523ccba 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Servers
95 } 95 }
96 96
97 97
98 public static BaseHttpServer ÚnSecureInstance 98 public static BaseHttpServer UnSecureInstance
99 { 99 {
100 get { return unsecureinstance; } 100 get { return unsecureinstance; }
101 101
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index 7e8308e..0112c1e 100644
--- a/OpenSim/Region/Application/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -98,7 +98,7 @@ namespace OpenSim
98 server.Start(false, false); 98 server.Start(false, false);
99 99
100 MainServer.AddHttpServer(server); 100 MainServer.AddHttpServer(server);
101 MainServer.ÚnSecureInstance = server; 101 MainServer.UnSecureInstance = server;
102 102
103 MainServer.Instance = m_httpServer; 103 MainServer.Instance = m_httpServer;
104 104
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs
index 9273b20..5a01fa9 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs
@@ -52,12 +52,12 @@ namespace OpenSim.Region.DataSnapshot
52 m_externalData = externalData; 52 m_externalData = externalData;
53 53
54 //Register HTTP handler 54 //Register HTTP handler
55 if (MainServer.ÚnSecureInstance.AddHTTPHandler("collector", OnGetSnapshot)) 55 if (MainServer.UnSecureInstance.AddHTTPHandler("collector", OnGetSnapshot))
56 { 56 {
57 m_log.Info("[DATASNAPSHOT]: Set up snapshot service"); 57 m_log.Info("[DATASNAPSHOT]: Set up snapshot service");
58 } 58 }
59 // Register validation callback handler 59 // Register validation callback handler
60 MainServer.ÚnSecureInstance.AddHTTPHandler("validate", OnValidate); 60 MainServer.UnSecureInstance.AddHTTPHandler("validate", OnValidate);
61 61
62 } 62 }
63 63