aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712009-04-03 20:56:36 +0000
committerlbsa712009-04-03 20:56:36 +0000
commit7f4bf5871d12ac050b12f1f248093e420844733d (patch)
treea36e5ec994ee7988d58bd07de83512599ca63c87 /OpenSim
parent* Fixes issue where of you force your avatar against a region corner, it gets... (diff)
downloadopensim-SC-7f4bf5871d12ac050b12f1f248093e420844733d.zip
opensim-SC-7f4bf5871d12ac050b12f1f248093e420844733d.tar.gz
opensim-SC-7f4bf5871d12ac050b12f1f248093e420844733d.tar.bz2
opensim-SC-7f4bf5871d12ac050b12f1f248093e420844733d.tar.xz
* Proactively fixed bug-potential concerning the fact that m_httpServer property was differently referred to between RegionApplicationBase and all other grid services.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs7
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs1
2 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 4cdb074..f24cf99 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -111,12 +111,7 @@ namespace OpenSim
111 } 111 }
112 112
113 protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); 113 protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>();
114 114
115 public new BaseHttpServer HttpServer
116 {
117 get { return m_httpServer; }
118 }
119
120 public uint HttpServerPort 115 public uint HttpServerPort
121 { 116 {
122 get { return m_httpServerPort; } 117 get { return m_httpServerPort; }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index c1c212c..c1a2dd3 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -53,7 +53,6 @@ namespace OpenSim.Region.ClientStack
53 get { return m_networkServersInfo; } 53 get { return m_networkServersInfo; }
54 } 54 }
55 55
56 protected BaseHttpServer m_httpServer;
57 protected uint m_httpServerPort; 56 protected uint m_httpServerPort;
58 57
59 public CommunicationsManager CommunicationsManager 58 public CommunicationsManager CommunicationsManager