diff options
author | Arthur Valadares | 2009-05-21 20:28:59 +0000 |
---|---|---|
committer | Arthur Valadares | 2009-05-21 20:28:59 +0000 |
commit | a85f496f4d097a4441ae9e6df8e282c4b327e75a (patch) | |
tree | 794b7cec23fab7803c7f3b4f496868ef96d01f53 /OpenSim/Client/Linden/LLClientStackModule.cs | |
parent | normalize quats before applying llSetRot() (diff) | |
download | opensim-SC_OLD-a85f496f4d097a4441ae9e6df8e282c4b327e75a.zip opensim-SC_OLD-a85f496f4d097a4441ae9e6df8e282c4b327e75a.tar.gz opensim-SC_OLD-a85f496f4d097a4441ae9e6df8e282c4b327e75a.tar.bz2 opensim-SC_OLD-a85f496f4d097a4441ae9e6df8e282c4b327e75a.tar.xz |
* Upgraded LLStandaloneLoginModule, LLProxyLoginModule and LLClientStackModule to new
region modules. This was needed because the stand alone and grid modules weren't deleting
old scenes, which caused an issue when deleting and recreating a region with same name
on same x,y coordinates. Tested it on standalone and issue is fixed. Requires prebuild
to be run again.
Fixes Mantis #3699
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Client/Linden/LLClientStackModule.cs | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs index 461c651..74612bb 100644 --- a/OpenSim/Client/Linden/LLClientStackModule.cs +++ b/OpenSim/Client/Linden/LLClientStackModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
41 | 41 | ||
42 | namespace OpenSim.Client.Linden | 42 | namespace OpenSim.Client.Linden |
43 | { | 43 | { |
44 | public class LLClientStackModule : IRegionModule | 44 | public class LLClientStackModule : INonSharedRegionModule |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
@@ -55,11 +55,10 @@ namespace OpenSim.Client.Linden | |||
55 | 55 | ||
56 | protected string m_clientStackDll = "OpenSim.Region.ClientStack.LindenUDP.dll"; | 56 | protected string m_clientStackDll = "OpenSim.Region.ClientStack.LindenUDP.dll"; |
57 | 57 | ||
58 | public void Initialise(Scene scene, IConfigSource source) | 58 | public void Initialise(IConfigSource source) |
59 | { | 59 | { |
60 | if (m_scene == null) | 60 | if (m_scene == null) |
61 | { | 61 | { |
62 | m_scene = scene; | ||
63 | m_source = source; | 62 | m_source = source; |
64 | 63 | ||
65 | IConfig startupConfig = m_source.Configs["Startup"]; | 64 | IConfig startupConfig = m_source.Configs["Startup"]; |
@@ -70,8 +69,23 @@ namespace OpenSim.Client.Linden | |||
70 | } | 69 | } |
71 | } | 70 | } |
72 | 71 | ||
73 | public void PostInitialise() | 72 | public void AddRegion(Scene scene) |
74 | { | 73 | { |
74 | |||
75 | } | ||
76 | |||
77 | public void RemoveRegion(Scene scene) | ||
78 | { | ||
79 | |||
80 | } | ||
81 | |||
82 | public void RegionLoaded(Scene scene) | ||
83 | { | ||
84 | if (m_scene == null) | ||
85 | { | ||
86 | m_scene = scene; | ||
87 | } | ||
88 | |||
75 | if ((m_scene != null) && (m_createClientStack)) | 89 | if ((m_scene != null) && (m_createClientStack)) |
76 | { | 90 | { |
77 | m_log.Info("[LLClientStackModule] Starting up LLClientStack."); | 91 | m_log.Info("[LLClientStackModule] Starting up LLClientStack."); |