diff options
| author | Melanie | 2013-02-28 21:20:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-28 21:20:07 +0000 |
| commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
| tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
| download | opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 3f63534..7361f50 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -752,7 +752,7 @@ namespace OpenSim | |||
| 752 | // listenIP = IPAddress.Parse("0.0.0.0"); | 752 | // listenIP = IPAddress.Parse("0.0.0.0"); |
| 753 | 753 | ||
| 754 | uint port = (uint) regionInfo.InternalEndPoint.Port; | 754 | uint port = (uint) regionInfo.InternalEndPoint.Port; |
| 755 | IClientNetworkServer clientNetworkServer; | 755 | |
| 756 | if (m_autoCreateClientStack) | 756 | if (m_autoCreateClientStack) |
| 757 | { | 757 | { |
| 758 | clientNetworkServers = m_clientStackManager.CreateServers( | 758 | clientNetworkServers = m_clientStackManager.CreateServers( |