aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ICommand.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ICommandableModule.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ICommander.cs4
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandChannel.cs5
-rw-r--r--OpenSim/Region/Environment/Interfaces/ILandObject.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ITextureSender.cs2
-rw-r--r--OpenSim/Region/Environment/Interfaces/IXMLRPC.cs2
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs17
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/CommanderTestModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/DynamicTextureModule.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/FriendsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/GroupsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/InventoryModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/TextureSender.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/TreePopulatorModule.cs15
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs11
-rw-r--r--OpenSim/Region/Environment/Modules/VectorRenderModule.cs20
-rw-r--r--OpenSim/Region/Environment/Modules/VoiceModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/WorldCommModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs15
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/AvatarAnimations.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/AvatarAppearance.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs27
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs4
-rw-r--r--OpenSim/Region/Environment/StorageManager.cs4
-rw-r--r--OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs3
-rw-r--r--OpenSim/Region/Environment/Types/UpdateQueue.cs11
60 files changed, 215 insertions, 252 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index ba4f0c6..b3ffd10 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -27,11 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
36 36
37namespace OpenSim.Region.Environment 37namespace OpenSim.Region.Environment
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment
41 /// </summary> 41 /// </summary>
42 public class EstateManager 42 public class EstateManager
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private Scene m_scene; 46 private Scene m_scene;
47 private RegionInfo m_regInfo; 47 private RegionInfo m_regInfo;
diff --git a/OpenSim/Region/Environment/Interfaces/ICommand.cs b/OpenSim/Region/Environment/Interfaces/ICommand.cs
index c119736..4eeb16c 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommand.cs
+++ b/OpenSim/Region/Environment/Interfaces/ICommand.cs
@@ -25,16 +25,14 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System.Collections.Generic;
29
30using OpenSim.Region.Environment.Modules.ModuleFramework;
31 29
32namespace OpenSim.Region.Environment.Interfaces 30namespace OpenSim.Region.Environment.Interfaces
33{ 31{
34 public interface ICommand 32 public interface ICommand
35 { 33 {
36 void AddArgument(string name, string helptext, string type); 34 void AddArgument(string name, string helptext, string type);
37 System.Collections.Generic.Dictionary<string, string> Arguments { get; } 35 Dictionary<string, string> Arguments { get; }
38 string Help { get; } 36 string Help { get; }
39 string Name { get; } 37 string Name { get; }
40 void Run(object[] args); 38 void Run(object[] args);
diff --git a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs b/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
index 067c43a..c4ed942 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs
@@ -25,12 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Region.Environment.Modules.ModuleFramework;
33
34namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Environment.Interfaces
35{ 29{
36 public interface ICommandableModule 30 public interface ICommandableModule
diff --git a/OpenSim/Region/Environment/Interfaces/ICommander.cs b/OpenSim/Region/Environment/Interfaces/ICommander.cs
index 7cc6ffb..c4102af 100644
--- a/OpenSim/Region/Environment/Interfaces/ICommander.cs
+++ b/OpenSim/Region/Environment/Interfaces/ICommander.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29
30using OpenSim.Region.Environment.Modules.ModuleFramework;
31
32namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Environment.Interfaces
33{ 29{
34 public interface ICommander 30 public interface ICommander
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
index 98bab63..464a213 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandChannel.cs
@@ -25,14 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 29using libsecondlife;
33using libsecondlife.Packets; 30using libsecondlife.Packets;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
36 33
37namespace OpenSim.Region.Environment.Interfaces 34namespace OpenSim.Region.Environment.Interfaces
38{ 35{
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
index 33ccddc..420ffc3 100644
--- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Environment/Interfaces/ILandObject.cs
@@ -25,15 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 29using libsecondlife;
33using libsecondlife.Packets; 30using libsecondlife.Packets;
34using OpenSim.Region.Environment.Scenes;
35
36using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
37 33
38namespace OpenSim.Region.Environment.Interfaces 34namespace OpenSim.Region.Environment.Interfaces
39{ 35{
diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
index f262b9a..1b9e4eb 100644
--- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
+++ b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29
30namespace OpenSim.Region.Environment.Interfaces 28namespace OpenSim.Region.Environment.Interfaces
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
index 358b56f..c7f1001 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
@@ -27,8 +27,6 @@
27 27
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Region.Environment.Modules; 29using OpenSim.Region.Environment.Modules;
30using System.Collections;
31using System.Collections.Generic;
32 30
33namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Environment.Interfaces
34{ 32{
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index 7fb8d8a..43ca7bd 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using log4net;
32using Nini.Config; 33using Nini.Config;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment
39{ 39{
40 public class ModuleLoader 40 public class ModuleLoader
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>(); 44 public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
45 45
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
index 7ae3eba..cec7192 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
@@ -27,7 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
@@ -129,8 +131,8 @@ namespace OpenSim.Region.Environment.Modules
129 //should merge this classes and clean up 131 //should merge this classes and clean up
130 public class AgentAssetTransactionsManager 132 public class AgentAssetTransactionsManager
131 { 133 {
132 private static readonly log4net.ILog m_log 134 private static readonly ILog m_log
133 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 135 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
134 136
135 // Fields 137 // Fields
136 public Scene MyScene; 138 public Scene MyScene;
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index d5f1b36..97db31e 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -25,9 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Threading;
31using libsecondlife; 29using libsecondlife;
32using libsecondlife.Packets; 30using libsecondlife.Packets;
33using Nini.Config; 31using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
index 52b9c3e..1b537c2 100644
--- a/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
@@ -27,24 +27,25 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using Nini.Config; 33using Nini.Config;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Region.Capabilities; 38using OpenSim.Region.Capabilities;
38using Caps = OpenSim.Region.Capabilities.Caps;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
41using Caps=OpenSim.Region.Capabilities.Caps;
41 42
42namespace OpenSim.Region.Environment.Modules 43namespace OpenSim.Region.Environment.Modules
43{ 44{
44 public class AsteriskVoiceModule : IRegionModule 45 public class AsteriskVoiceModule : IRegionModule
45 { 46 {
46 private static readonly log4net.ILog m_log = 47 private static readonly ILog m_log =
47 log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 49
49 private Scene m_scene; 50 private Scene m_scene;
50 private IConfig m_config; 51 private IConfig m_config;
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index e3ad297..44b3f8b 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -25,7 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Reflection;
28using libsecondlife; 30using libsecondlife;
31using log4net;
29using Nini.Config; 32using Nini.Config;
30using OpenSim.Framework; 33using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
@@ -35,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules
35{ 38{
36 public class AvatarProfilesModule : IRegionModule 39 public class AvatarProfilesModule : IRegionModule
37 { 40 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 private Scene m_scene; 42 private Scene m_scene;
40 43
41 public AvatarProfilesModule() 44 public AvatarProfilesModule()
@@ -92,8 +95,8 @@ namespace OpenSim.Region.Environment.Modules
92 { 95 {
93 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, 96 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
94 Util.ToDateTime(profile.Created).ToString(), 97 Util.ToDateTime(profile.Created).ToString(),
95 System.String.Empty, profile.FirstLifeAboutText, profile.CanDoMask, 98 String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
96 profile.FirstLifeImage, profile.Image, System.String.Empty, partner); 99 profile.FirstLifeImage, profile.Image, String.Empty, partner);
97 } 100 }
98 else 101 else
99 { 102 {
diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index 0748719..d5b2ea2 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -30,16 +30,15 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection;
33using System.Xml; 34using System.Xml;
34using libsecondlife; 35using libsecondlife;
36using log4net;
35using Nini.Config; 37using Nini.Config;
38using Nwc.XmlRpc;
36using OpenSim.Framework; 39using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
39using Nwc.XmlRpc;
40
41using MoneyTransferArgs = OpenSim.Region.Environment.Scenes.EventManager.MoneyTransferArgs;
42using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
43 42
44namespace OpenSim.Region.Environment.Modules 43namespace OpenSim.Region.Environment.Modules
45{ 44{
@@ -56,7 +55,7 @@ namespace OpenSim.Region.Environment.Modules
56 /// </summary> 55 /// </summary>
57 public class BetaGridLikeMoneyModule: IRegionModule 56 public class BetaGridLikeMoneyModule: IRegionModule
58 { 57 {
59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 59
61 /// <summary> 60 /// <summary>
62 /// Region UUIDS indexed by AgentID 61 /// Region UUIDS indexed by AgentID
@@ -341,7 +340,7 @@ namespace OpenSim.Region.Environment.Modules
341 } 340 }
342 } 341 }
343 342
344 private void ValidateLandBuy (Object osender, LandBuyArgs e) 343 private void ValidateLandBuy (Object osender, EventManager.LandBuyArgs e)
345 { 344 {
346 if (m_MoneyAddress.Length == 0) 345 if (m_MoneyAddress.Length == 0)
347 { 346 {
@@ -372,7 +371,7 @@ namespace OpenSim.Region.Environment.Modules
372 } 371 }
373 } 372 }
374 373
375 private void processLandBuy(Object osender, LandBuyArgs e) 374 private void processLandBuy(Object osender, EventManager.LandBuyArgs e)
376 { 375 {
377 lock(e) 376 lock(e)
378 { 377 {
@@ -396,7 +395,7 @@ namespace OpenSim.Region.Environment.Modules
396 /// </summary> 395 /// </summary>
397 /// <param name="osender"></param> 396 /// <param name="osender"></param>
398 /// <param name="e"></param> 397 /// <param name="e"></param>
399 private void MoneyTransferAction (Object osender, MoneyTransferArgs e) 398 private void MoneyTransferAction (Object osender, EventManager.MoneyTransferArgs e)
400 { 399 {
401 IClientAPI sender = null; 400 IClientAPI sender = null;
402 IClientAPI receiver = null; 401 IClientAPI receiver = null;
@@ -724,7 +723,7 @@ namespace OpenSim.Region.Environment.Modules
724 { 723 {
725 returnfunds = GetFundsForAgentID(agentID); 724 returnfunds = GetFundsForAgentID(agentID);
726 } 725 }
727 catch (System.Exception e) 726 catch (Exception e)
728 { 727 {
729 client.SendAlertMessage(e.Message + " "); 728 client.SendAlertMessage(e.Message + " ");
730 } 729 }
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index f854409..30c1397 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -29,9 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using System.Threading; 34using System.Threading;
34using libsecondlife; 35using libsecondlife;
36using log4net;
35using Nini.Config; 37using Nini.Config;
36using OpenSim.Framework; 38using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Environment.Interfaces;
@@ -41,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules
41{ 43{
42 public class ChatModule : IRegionModule, ISimChat 44 public class ChatModule : IRegionModule, ISimChat
43 { 45 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 47
46 private List<Scene> m_scenes = new List<Scene>(); 48 private List<Scene> m_scenes = new List<Scene>();
47 49
@@ -116,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules
116 if (!m_irc_connector.IsAlive) 118 if (!m_irc_connector.IsAlive)
117 { 119 {
118 m_irc_connector.Start(); 120 m_irc_connector.Start();
119 OpenSim.Framework.ThreadTracker.Add(m_irc_connector); 121 ThreadTracker.Add(m_irc_connector);
120 } 122 }
121 } 123 }
122 catch (Exception) 124 catch (Exception)
@@ -267,7 +269,7 @@ namespace OpenSim.Region.Environment.Modules
267 if (!m_irc_connector.IsAlive) 269 if (!m_irc_connector.IsAlive)
268 { 270 {
269 m_irc_connector.Start(); 271 m_irc_connector.Start();
270 OpenSim.Framework.ThreadTracker.Add(m_irc_connector); 272 ThreadTracker.Add(m_irc_connector);
271 } 273 }
272 } 274 }
273 catch (Exception) 275 catch (Exception)
@@ -336,7 +338,7 @@ namespace OpenSim.Region.Environment.Modules
336 338
337 internal class IRCChatModule 339 internal class IRCChatModule
338 { 340 {
339 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 341 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
340 342
341 private string m_server = null; 343 private string m_server = null;
342 private uint m_port = 6668; 344 private uint m_port = 6668;
@@ -431,13 +433,13 @@ namespace OpenSim.Region.Environment.Modules
431 pingSender.Name = "PingSenderThread"; 433 pingSender.Name = "PingSenderThread";
432 pingSender.IsBackground = true; 434 pingSender.IsBackground = true;
433 pingSender.Start(); 435 pingSender.Start();
434 OpenSim.Framework.ThreadTracker.Add(pingSender); 436 ThreadTracker.Add(pingSender);
435 437
436 listener = new Thread(new ThreadStart(ListenerRun)); 438 listener = new Thread(new ThreadStart(ListenerRun));
437 listener.Name = "IRCChatModuleListenerThread"; 439 listener.Name = "IRCChatModuleListenerThread";
438 listener.IsBackground = true; 440 listener.IsBackground = true;
439 listener.Start(); 441 listener.Start();
440 OpenSim.Framework.ThreadTracker.Add(listener); 442 ThreadTracker.Add(listener);
441 443
442 m_writer.WriteLine(m_user); 444 m_writer.WriteLine(m_user);
443 m_writer.Flush(); 445 m_writer.Flush();
diff --git a/OpenSim/Region/Environment/Modules/CommanderTestModule.cs b/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
index 0133f27..a30de73 100644
--- a/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
+++ b/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
@@ -26,13 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using libsecondlife;
31using Nini.Config; 29using Nini.Config;
32using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Modules.ModuleFramework; 31using OpenSim.Region.Environment.Modules.ModuleFramework;
32using OpenSim.Region.Environment.Scenes;
36 33
37namespace OpenSim.Region.Environment.Modules 34namespace OpenSim.Region.Environment.Modules
38{ 35{
diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index ee84499..02354f1 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -26,14 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Drawing;
30using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing;
31using System.Drawing.Imaging;
31using libsecondlife; 32using libsecondlife;
32using Nini.Config; 33using Nini.Config;
34using OpenJPEGNet;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
36using OpenJPEGNet;
37 38
38namespace OpenSim.Region.Environment.Modules 39namespace OpenSim.Region.Environment.Modules
39{ 40{
@@ -252,7 +253,7 @@ namespace OpenSim.Region.Environment.Modules
252 Bitmap joint; 253 Bitmap joint;
253 Graphics jG; 254 Graphics jG;
254 255
255 joint = new Bitmap(back.Width, back.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb); 256 joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
256 jG = Graphics.FromImage(joint); 257 jG = Graphics.FromImage(joint);
257 258
258 jG.DrawImage(back, 0, 0, back.Width, back.Height); 259 jG.DrawImage(back, 0, 0, back.Width, back.Height);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
index 0faa573..f811f22 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
@@ -27,18 +27,15 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.IO;
31using libsecondlife;
32using Nini.Config; 31using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Modules.ModuleFramework; 33using OpenSim.Region.Environment.Modules.ModuleFramework;
37using System.IO; 34using OpenSim.Region.Environment.Scenes;
38 35
39namespace OpenSim.Region.Environment.Modules.ExportSerialiser 36namespace OpenSim.Region.Environment.Modules.ExportSerialiser
40{ 37{
41 public class ExportSerialisationModule : IRegionModule, OpenSim.Region.Environment.Modules.ExportSerialiser.IRegionSerialiser 38 public class ExportSerialisationModule : IRegionModule, IRegionSerialiser
42 { 39 {
43 private List<Scene> m_regions = new List<Scene>(); 40 private List<Scene> m_regions = new List<Scene>();
44 private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>(); 41 private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
index f13c8fa..8cd97a8 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
33 29
34namespace OpenSim.Region.Environment.Modules.ExportSerialiser 30namespace OpenSim.Region.Environment.Modules.ExportSerialiser
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
index a9454fc..5b10957 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
@@ -25,11 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System.Collections.Generic;
29using OpenSim.Region.Environment.Scenes;
30
29namespace OpenSim.Region.Environment.Modules.ExportSerialiser 31namespace OpenSim.Region.Environment.Modules.ExportSerialiser
30{ 32{
31 public interface IRegionSerialiser 33 public interface IRegionSerialiser
32 { 34 {
33 System.Collections.Generic.List<string> SerialiseRegion(OpenSim.Region.Environment.Scenes.Scene scene, string saveDir); 35 List<string> SerialiseRegion(Scene scene, string saveDir);
34 } 36 }
35} 37}
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
index e413466..ac80f40 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
@@ -25,10 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Scenes;
29using System.IO;
30using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using System.Text;
31using System.Xml; 31using System.Xml;
32using OpenSim.Region.Environment.Scenes;
32 33
33namespace OpenSim.Region.Environment.Modules.ExportSerialiser 34namespace OpenSim.Region.Environment.Modules.ExportSerialiser
34{ 35{
@@ -61,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
61 xmlstream += "</scene>"; 62 xmlstream += "</scene>";
62 63
63 MemoryStream stream = new MemoryStream(); 64 MemoryStream stream = new MemoryStream();
64 XmlTextWriter formatter = new XmlTextWriter(stream, System.Text.Encoding.UTF8); 65 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
65 XmlDocument doc = new XmlDocument(); 66 XmlDocument doc = new XmlDocument();
66 67
67 doc.LoadXml(xmlstream); 68 doc.LoadXml(xmlstream);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
index eeeacdc..8555089 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Modules.Terrain; 28using OpenSim.Region.Environment.Modules.Terrain;
29using OpenSim.Region.Environment.Modules.Terrain.FileLoaders;
29using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.ExportSerialiser 32namespace OpenSim.Region.Environment.Modules.ExportSerialiser
@@ -36,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
36 37
37 public string WriteToFile(Scene scene, string dir) 38 public string WriteToFile(Scene scene, string dir)
38 { 39 {
39 ITerrainLoader fileSystemExporter = new Terrain.FileLoaders.RAW32(); 40 ITerrainLoader fileSystemExporter = new RAW32();
40 string targetFileName = dir + "heightmap.r32"; 41 string targetFileName = dir + "heightmap.r32";
41 42
42 lock (scene.Heightmap) 43 lock (scene.Heightmap)
diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index a2ec599..7e12618 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -26,8 +26,10 @@
26 */ 26 */
27using System; 27using System;
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
29using libsecondlife; 30using libsecondlife;
30using libsecondlife.Packets; 31using libsecondlife.Packets;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using Nwc.XmlRpc; 34using Nwc.XmlRpc;
33using OpenSim.Framework; 35using OpenSim.Framework;
@@ -38,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules
38{ 40{
39 public class FriendsModule : IRegionModule 41 public class FriendsModule : IRegionModule
40 { 42 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 44
43 private List<Scene> m_scene = new List<Scene>(); 45 private List<Scene> m_scene = new List<Scene>();
44 46
diff --git a/OpenSim/Region/Environment/Modules/GroupsModule.cs b/OpenSim/Region/Environment/Modules/GroupsModule.cs
index 6cdae7b..b23bb91 100644
--- a/OpenSim/Region/Environment/Modules/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/GroupsModule.cs
@@ -27,7 +27,9 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
@@ -37,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules
37{ 39{
38 public class GroupsModule : IRegionModule 40 public class GroupsModule : IRegionModule
39 { 41 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 43
42 private List<Scene> m_scene = new List<Scene>(); 44 private List<Scene> m_scene = new List<Scene>();
43 private Dictionary<LLUUID, IClientAPI> m_iclientmap = new Dictionary<LLUUID, IClientAPI>(); 45 private Dictionary<LLUUID, IClientAPI> m_iclientmap = new Dictionary<LLUUID, IClientAPI>();
diff --git a/OpenSim/Region/Environment/Modules/InventoryModule.cs b/OpenSim/Region/Environment/Modules/InventoryModule.cs
index eadbb4f..ff5a02c 100644
--- a/OpenSim/Region/Environment/Modules/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/InventoryModule.cs
@@ -25,12 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30 29using System.Reflection;
31using libsecondlife; 30using libsecondlife;
31using log4net;
32using Nini.Config; 32using Nini.Config;
33
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
@@ -39,8 +38,8 @@ namespace OpenSim.Region.Environment.Modules
39{ 38{
40 public class InventoryModule : IRegionModule 39 public class InventoryModule : IRegionModule
41 { 40 {
42 private static readonly log4net.ILog m_log 41 private static readonly ILog m_log
43 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 43
45 private Scene m_scene; 44 private Scene m_scene;
46 45
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
index e3b7cf5..561c5cf 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
@@ -27,18 +27,14 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using Axiom.Math; 30using Axiom.Math;
32using libsecondlife; 31using libsecondlife;
33using libsecondlife.Packets; 32using libsecondlife.Packets;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes;
38using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
39 37
40using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
41
42namespace OpenSim.Region.Environment.Modules.LandManagement 38namespace OpenSim.Region.Environment.Modules.LandManagement
43{ 39{
44 public class LandChannel : ILandChannel 40 public class LandChannel : ILandChannel
@@ -245,7 +241,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
245 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0))); 241 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
246 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0))); 242 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
247 } 243 }
248 catch (System.OverflowException) 244 catch (OverflowException)
249 { 245 {
250 return null; 246 return null;
251 } 247 }
@@ -957,7 +953,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
957 // and land has been validated as well, this method transfers 953 // and land has been validated as well, this method transfers
958 // the land ownership 954 // the land ownership
959 955
960 public void handleLandBuyRequest(Object o, LandBuyArgs e) 956 public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e)
961 { 957 {
962 if (e.economyValidated && e.landValidated) 958 if (e.economyValidated && e.landValidated)
963 { 959 {
@@ -976,7 +972,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
976 // be validated. This method validates the right to buy the 972 // be validated. This method validates the right to buy the
977 // parcel 973 // parcel
978 974
979 public void handleLandValidationRequest(Object o, LandBuyArgs e) 975 public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e)
980 { 976 {
981 if (e.landValidated == false) 977 if (e.landValidated == false)
982 { 978 {
@@ -994,7 +990,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
994 int saleprice = lob.landData.salePrice; 990 int saleprice = lob.landData.salePrice;
995 LLUUID pOwnerID = lob.landData.ownerID; 991 LLUUID pOwnerID = lob.landData.ownerID;
996 992
997 bool landforsale = ((lob.landData.landFlags & (uint)(libsecondlife.Parcel.ParcelFlags.ForSale | libsecondlife.Parcel.ParcelFlags.ForSaleObjects | libsecondlife.Parcel.ParcelFlags.SellParcelObjects)) != 0); 993 bool landforsale = ((lob.landData.landFlags & (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0);
998 if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) 994 if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
999 { 995 {
1000 lock (e) 996 lock (e)
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
index 20f75df..1c36c0c 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
@@ -25,17 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using libsecondlife;
31using libsecondlife.Packets;
32using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Interfaces;
36using Nini.Config; 28using Nini.Config;
37 29using OpenSim.Region.Environment.Interfaces;
38using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; 30using OpenSim.Region.Environment.Scenes;
39 31
40namespace OpenSim.Region.Environment.Modules.LandManagement 32namespace OpenSim.Region.Environment.Modules.LandManagement
41{ 33{
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 69d3c05..f9684e6 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes;
36 37
37namespace OpenSim.Region.Environment.Modules.LandManagement 38namespace OpenSim.Region.Environment.Modules.LandManagement
38{ 39{
@@ -46,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
46 { 47 {
47 #region Member Variables 48 #region Member Variables
48 49
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 51
51 protected LandData m_landData = new LandData(); 52 protected LandData m_landData = new LandData();
52 protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>(); 53 protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
@@ -273,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
273 newData.claimPrice = claimprice; 274 newData.claimPrice = claimprice;
274 newData.salePrice = 0; 275 newData.salePrice = 0;
275 newData.authBuyerID = LLUUID.Zero; 276 newData.authBuyerID = LLUUID.Zero;
276 newData.landFlags &= ~(uint)(libsecondlife.Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); 277 newData.landFlags &= ~(uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
277 m_scene.LandChannel.updateLandObject(landData.localID, newData); 278 m_scene.LandChannel.updateLandObject(landData.localID, newData);
278 279
279 sendLandUpdateToAvatarsOverMe(); 280 sendLandUpdateToAvatarsOverMe();
diff --git a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
index 9834a8a..27d73b5 100644
--- a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
+++ b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
@@ -27,8 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Text; 31using System.Text;
31 32using log4net;
33using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
33 35
34namespace OpenSim.Region.Environment.Modules.ModuleFramework 36namespace OpenSim.Region.Environment.Modules.ModuleFramework
@@ -39,9 +41,9 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
39 /// </summary> 41 /// </summary>
40 public class Command : ICommand 42 public class Command : ICommand
41 { 43 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
44 private Action<Object[]> m_command; 46 private Action<object[]> m_command;
45 private string m_name; 47 private string m_name;
46 private string m_help; 48 private string m_help;
47 private List<CommandArgument> m_args = new List<CommandArgument>(); 49 private List<CommandArgument> m_args = new List<CommandArgument>();
@@ -197,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
197 /// </summary> 199 /// </summary>
198 public class Commander : ICommander 200 public class Commander : ICommander
199 { 201 {
200 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 202 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
201 private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>(); 203 private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();
202 private string m_name; 204 private string m_name;
203 205
@@ -241,7 +243,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
241 classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( "; 243 classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( ";
242 foreach (KeyValuePair<string, string> arg in com.Arguments) 244 foreach (KeyValuePair<string, string> arg in com.Arguments)
243 { 245 {
244 classSrc += arg.Value + " " + Framework.Util.Md5Hash(arg.Key) + ","; 246 classSrc += arg.Value + " " + Util.Md5Hash(arg.Key) + ",";
245 } 247 }
246 classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma 248 classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma
247 classSrc += " )\n\t{\n"; 249 classSrc += " )\n\t{\n";
@@ -249,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
249 int i = 0; 251 int i = 0;
250 foreach (KeyValuePair<string, string> arg in com.Arguments) 252 foreach (KeyValuePair<string, string> arg in com.Arguments)
251 { 253 {
252 classSrc += "\t\targs[" + i.ToString() + "] = " + Framework.Util.Md5Hash(arg.Key) + " " + ";\n"; 254 classSrc += "\t\targs[" + i.ToString() + "] = " + Util.Md5Hash(arg.Key) + " " + ";\n";
253 i++; 255 i++;
254 } 256 }
255 classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n"; 257 classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n";
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index 10e3840..2de5975 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -33,6 +33,7 @@ using System.Text;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
38 39
@@ -289,7 +290,7 @@ namespace OpenSim.Region.Environment.Modules
289 httpThread.IsBackground = true; 290 httpThread.IsBackground = true;
290 finished = false; 291 finished = false;
291 httpThread.Start(); 292 httpThread.Start();
292 OpenSim.Framework.ThreadTracker.Add(httpThread); 293 ThreadTracker.Add(httpThread);
293 } 294 }
294 295
295 /* 296 /*
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 1d32c1f..bde0dc0 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules
74 m_thread.Name = "ProcessTextureSenderThread"; 74 m_thread.Name = "ProcessTextureSenderThread";
75 m_thread.IsBackground = true; 75 m_thread.IsBackground = true;
76 m_thread.Start(); 76 m_thread.Start();
77 OpenSim.Framework.ThreadTracker.Add(m_thread); 77 ThreadTracker.Add(m_thread);
78 } 78 }
79 79
80 if (!m_scenes.Contains(scene)) 80 if (!m_scenes.Contains(scene))
diff --git a/OpenSim/Region/Environment/Modules/TextureSender.cs b/OpenSim/Region/Environment/Modules/TextureSender.cs
index 1500bdb..e54a1a2 100644
--- a/OpenSim/Region/Environment/Modules/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/TextureSender.cs
@@ -26,10 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using System.Reflection;
30using libsecondlife.Packets; 30using libsecondlife.Packets;
31using log4net;
31using OpenSim.Framework; 32using OpenSim.Framework;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Modules 35namespace OpenSim.Region.Environment.Modules
@@ -40,8 +40,8 @@ namespace OpenSim.Region.Environment.Modules
40 /// </summary> 40 /// </summary>
41 public class TextureSender : ITextureSender 41 public class TextureSender : ITextureSender
42 { 42 {
43 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
44 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 /// <summary> 46 /// <summary>
47 /// Records the number of times texture send has been called. 47 /// Records the number of times texture send has been called.
diff --git a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
index ec977ba..2051a0f 100644
--- a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
@@ -27,10 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Timers;
32using Axiom.Math;
30using libsecondlife; 33using libsecondlife;
34using log4net;
31using Nini.Config; 35using Nini.Config;
32using OpenSim.Framework; 36using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
36 39
@@ -42,7 +45,7 @@ namespace OpenSim.Region.Environment.Modules
42 public class TreePopulatorModule : IRegionModule 45 public class TreePopulatorModule : IRegionModule
43 { 46 {
44 private Scene m_scene; 47 private Scene m_scene;
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 49
47 private List<LLUUID> m_trees; 50 private List<LLUUID> m_trees;
48 51
@@ -63,8 +66,8 @@ namespace OpenSim.Region.Environment.Modules
63 66
64 m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole); 67 m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole);
65 68
66 System.Timers.Timer CalculateTrees = new System.Timers.Timer(m_tree_updates); 69 Timer CalculateTrees = new Timer(m_tree_updates);
67 CalculateTrees.Elapsed += new System.Timers.ElapsedEventHandler(CalculateTrees_Elapsed); 70 CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed);
68 CalculateTrees.Start(); 71 CalculateTrees.Start();
69 m_log.Debug("[TREES]: Initialised tree module"); 72 m_log.Debug("[TREES]: Initialised tree module");
70 } 73 }
@@ -168,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules
168 } 171 }
169 else 172 else
170 { 173 {
171 selectedTree.SetText(killLikelyhood.ToString(), new Axiom.Math.Vector3(1.0f, 1.0f, 1.0f), 1.0); 174 selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0);
172 } 175 }
173 } 176 }
174 else 177 else
@@ -217,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules
217 tree.SendGroupFullUpdate(); 220 tree.SendGroupFullUpdate();
218 } 221 }
219 222
220 void CalculateTrees_Elapsed(object sender, System.Timers.ElapsedEventArgs e) 223 void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
221 { 224 {
222 growTrees(); 225 growTrees();
223 seedTrees(); 226 seedTrees();
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 59ec981..b487628 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -25,15 +25,12 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30 29using System.Reflection;
31using libsecondlife; 30using libsecondlife;
32using libsecondlife.Packets; 31using log4net;
33
34using OpenSim.Framework; 32using OpenSim.Framework;
35using OpenSim.Framework.Communications.Limit; 33using OpenSim.Framework.Communications.Limit;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
39 36
@@ -46,8 +43,8 @@ namespace OpenSim.Region.Environment.Modules
46 /// </summary> 43 /// </summary>
47 public class UserTextureDownloadService 44 public class UserTextureDownloadService
48 { 45 {
49 private static readonly log4net.ILog m_log 46 private static readonly ILog m_log
50 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 48
52 /// <summary> 49 /// <summary>
53 /// We will allow the client to request the same texture n times before dropping further requests 50 /// We will allow the client to request the same texture n times before dropping further requests
diff --git a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
index 9c91b25..0ea6fc3 100644
--- a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
@@ -27,15 +27,17 @@
27 27
28using System; 28using System;
29using System.Drawing; 29using System.Drawing;
30using System.Drawing.Imaging;
31using System.Globalization;
30using System.IO; 32using System.IO;
31using System.Net; 33using System.Net;
32using System.Globalization;
33using libsecondlife; 34using libsecondlife;
34using Nini.Config; 35using Nini.Config;
35using OpenJPEGNet; 36using OpenJPEGNet;
36using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using Image=System.Drawing.Image;
40
39//using Cairo; 41//using Cairo;
40 42
41namespace OpenSim.Region.Environment.Modules 43namespace OpenSim.Region.Environment.Modules
@@ -96,9 +98,9 @@ namespace OpenSim.Region.Environment.Modules
96 if ((size < 128) || (size > 1024)) 98 if ((size < 128) || (size > 1024))
97 size = 256; 99 size = 256;
98 100
99 Bitmap bitmap = new Bitmap(size, size, System.Drawing.Imaging.PixelFormat.Format32bppArgb); 101 Bitmap bitmap = new Bitmap(size, size, PixelFormat.Format32bppArgb);
100 102
101 System.Drawing.Graphics graph = System.Drawing.Graphics.FromImage(bitmap); 103 Graphics graph = Graphics.FromImage(bitmap);
102 104
103 extraParams = extraParams.ToLower(); 105 extraParams = extraParams.ToLower();
104 int alpha = 255; 106 int alpha = 255;
@@ -166,11 +168,11 @@ namespace OpenSim.Region.Environment.Modules
166 } 168 }
167*/ 169*/
168 170
169 private void GDIDraw(string data, System.Drawing.Graphics graph) 171 private void GDIDraw(string data, Graphics graph)
170 { 172 {
171 System.Drawing.Point startPoint = new System.Drawing.Point(0, 0); 173 Point startPoint = new Point(0, 0);
172 System.Drawing.Point endPoint = new System.Drawing.Point(0, 0); 174 Point endPoint = new Point(0, 0);
173 System.Drawing.Pen drawPen = new Pen(System.Drawing.Color.Black, 7); 175 Pen drawPen = new Pen(Color.Black, 7);
174 Font myFont = new Font("Times New Roman", 14); 176 Font myFont = new Font("Times New Roman", 14);
175 SolidBrush myBrush = new SolidBrush(Color.Black); 177 SolidBrush myBrush = new SolidBrush(Color.Black);
176 char[] lineDelimiter = { ';' }; 178 char[] lineDelimiter = { ';' };
@@ -213,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules
213 GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y); 215 GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y);
214 endPoint.X = (int)x; 216 endPoint.X = (int)x;
215 endPoint.Y = (int)y; 217 endPoint.Y = (int)y;
216 System.Drawing.Image image = ImageHttpRequest(nextLine); 218 Image image = ImageHttpRequest(nextLine);
217 graph.DrawImage(image, (float)startPoint.X, (float)startPoint.Y, x, y); 219 graph.DrawImage(image, (float)startPoint.X, (float)startPoint.Y, x, y);
218 startPoint.X += endPoint.X; 220 startPoint.X += endPoint.X;
219 startPoint.Y += endPoint.Y; 221 startPoint.Y += endPoint.Y;
diff --git a/OpenSim/Region/Environment/Modules/VoiceModule.cs b/OpenSim/Region/Environment/Modules/VoiceModule.cs
index 8ca4698..106becd 100644
--- a/OpenSim/Region/Environment/Modules/VoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/VoiceModule.cs
@@ -27,23 +27,24 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using Nini.Config; 33using Nini.Config;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36using OpenSim.Region.Capabilities; 37using OpenSim.Region.Capabilities;
37using Caps = OpenSim.Region.Capabilities.Caps;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
40using Caps=OpenSim.Region.Capabilities.Caps;
40 41
41namespace OpenSim.Region.Environment.Modules 42namespace OpenSim.Region.Environment.Modules
42{ 43{
43 public class VoiceModule : IRegionModule 44 public class VoiceModule : IRegionModule
44 { 45 {
45 private static readonly log4net.ILog m_log = 46 private static readonly ILog m_log =
46 log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 48
48 private Scene m_scene; 49 private Scene m_scene;
49 private IConfig m_config; 50 private IConfig m_config;
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 79e475c..5b18757 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using libsecondlife; 30using libsecondlife;
32using Nini.Config; 31using Nini.Config;
33using OpenSim.Framework; 32using OpenSim.Framework;
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 4f52ad6..e915fb8 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -28,11 +28,14 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
31using System.Threading; 33using System.Threading;
32using libsecondlife; 34using libsecondlife;
35using log4net;
33using Nini.Config; 36using Nini.Config;
34using Nwc.XmlRpc; 37using Nwc.XmlRpc;
35using OpenSim.Framework.Console; 38using OpenSim.Framework;
36using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
37using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
@@ -74,7 +77,7 @@ namespace OpenSim.Region.Environment.Modules
74{ 77{
75 public class XMLRPCModule : IRegionModule, IXMLRPC 78 public class XMLRPCModule : IRegionModule, IXMLRPC
76 { 79 {
77 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 80 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
78 81
79 private object XMLRPCListLock = new object(); 82 private object XMLRPCListLock = new object();
80 private string m_name = "XMLRPCModule"; 83 private string m_name = "XMLRPCModule";
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Modules
208 } 211 }
209 } 212 }
210 213
211 System.Collections.IEnumerator tmpEnumerator = tmp.GetEnumerator(); 214 IEnumerator tmpEnumerator = tmp.GetEnumerator();
212 while ( tmpEnumerator.MoveNext() ) 215 while ( tmpEnumerator.MoveNext() )
213 m_openChannels.Remove((LLUUID)tmpEnumerator.Current); 216 m_openChannels.Remove((LLUUID)tmpEnumerator.Current);
214 } 217 }
@@ -559,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules
559 private Thread httpThread; 562 private Thread httpThread;
560 public LLUUID m_itemID; 563 public LLUUID m_itemID;
561 public uint m_localID; 564 public uint m_localID;
562 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 565 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
563 566
564 public SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata) 567 public SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata)
565 { 568 {
@@ -583,7 +586,7 @@ namespace OpenSim.Region.Environment.Modules
583 httpThread.IsBackground = true; 586 httpThread.IsBackground = true;
584 finished = false; 587 finished = false;
585 httpThread.Start(); 588 httpThread.Start();
586 OpenSim.Framework.ThreadTracker.Add(httpThread); 589 ThreadTracker.Add(httpThread);
587 590
588 return reqID; 591 return reqID;
589 592
@@ -648,7 +651,7 @@ namespace OpenSim.Region.Environment.Modules
648 } 651 }
649 } 652 }
650 } 653 }
651 catch (System.Net.WebException we) 654 catch (WebException we)
652 { 655 {
653 sdata = we.Message; 656 sdata = we.Message;
654 m_log.Warn("[SendRemoteDataRequest]: Request failed"); 657 m_log.Warn("[SendRemoteDataRequest]: Request failed");
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 29987d8..12ef110 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -26,8 +26,9 @@
26 */ 26 */
27 27
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Region.Environment.Scenes;
30using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
30using OpenSim.Region.Environment.Scenes;
31
31namespace OpenSim.Region.Environment 32namespace OpenSim.Region.Environment
32{ 33{
33 public class PermissionManager 34 public class PermissionManager
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
index 75d4870..fe9c8e7 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
@@ -25,11 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Xml; 29using System.Xml;
31using libsecondlife; 30using libsecondlife;
32using OpenSim.Framework.Console;
33 31
34namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Environment.Scenes
35{ 33{
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
index 750129b..8f29507 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
@@ -26,11 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Runtime.Serialization;
30using System.Security.Permissions;
29using libsecondlife; 31using libsecondlife;
30using libsecondlife.Packets; 32using libsecondlife.Packets;
31using OpenSim.Framework; 33using OpenSim.Framework;
32using System.Runtime.Serialization;
33using System.Security.Permissions;
34 34
35namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Environment.Scenes
36{ 36{
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
159 159
160 if (info == null) 160 if (info == null)
161 { 161 {
162 throw new System.ArgumentNullException("info"); 162 throw new ArgumentNullException("info");
163 } 163 }
164 164
165 m_scenePresenceID = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid))); 165 m_scenePresenceID = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid)));
@@ -182,7 +182,7 @@ namespace OpenSim.Region.Environment.Scenes
182 { 182 {
183 if (info == null) 183 if (info == null)
184 { 184 {
185 throw new System.ArgumentNullException("info"); 185 throw new ArgumentNullException("info");
186 } 186 }
187 187
188 info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID); 188 info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID);
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 438118f..1faba9a 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -25,13 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic;
29using Axiom.Math;
30using libsecondlife;
31
32using System; 28using System;
33using System.Runtime.Serialization; 29using System.Runtime.Serialization;
34using System.Security.Permissions; 30using System.Security.Permissions;
31using Axiom.Math;
32using libsecondlife;
35 33
36namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
37{ 35{
@@ -145,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
145 143
146 if (info == null) 144 if (info == null)
147 { 145 {
148 throw new System.ArgumentNullException("info"); 146 throw new ArgumentNullException("info");
149 } 147 }
150 148
151 m_uuid = new LLUUID((Guid)info.GetValue("m_uuid", typeof(Guid))); 149 m_uuid = new LLUUID((Guid)info.GetValue("m_uuid", typeof(Guid)));
@@ -188,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
188 { 186 {
189 if (info == null) 187 if (info == null)
190 { 188 {
191 throw new System.ArgumentNullException("info"); 189 throw new ArgumentNullException("info");
192 } 190 }
193 191
194 info.AddValue("m_uuid", m_uuid.UUID); 192 info.AddValue("m_uuid", m_uuid.UUID);
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 8894db0..329f900 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -27,11 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using Axiom.Math; 31using Axiom.Math;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Types; 36using OpenSim.Region.Environment.Types;
36using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
37 38
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
41 42
42 public class InnerScene 43 public class InnerScene
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 #region Events 47 #region Events
47 48
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes
295 296
296 public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot) 297 public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot)
297 { 298 {
298 System.Console.WriteLine("Attaching object " + objectLocalID + " to " + AttachmentPt); 299 Console.WriteLine("Attaching object " + objectLocalID + " to " + AttachmentPt);
299 SceneObjectPart p = GetSceneObjectPart(objectLocalID); 300 SceneObjectPart p = GetSceneObjectPart(objectLocalID);
300 if (p != null) 301 if (p != null)
301 { 302 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 2db9242..c5a1be1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -27,23 +27,21 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using Axiom.Math; 30using System.Reflection;
31using System.Text;
31using libsecondlife; 32using libsecondlife;
32using libsecondlife.Packets; 33using libsecondlife.Packets;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using System.IO;
37using System.Text;
38using System.Xml;
39using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
40 38
41namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
42{ 40{
43 public partial class Scene 41 public partial class Scene
44 { 42 {
45 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
48 /// <summary> 46 /// <summary>
49 /// Start all the scripts in the scene which should be started. 47 /// Start all the scripts in the scene which should be started.
@@ -454,7 +452,7 @@ namespace OpenSim.Region.Environment.Scenes
454 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); 452 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
455 if (item != null) 453 if (item != null)
456 { 454 {
457 if (newName != System.String.Empty) 455 if (newName != String.Empty)
458 { 456 {
459 item.Name = newName; 457 item.Name = newName;
460 } 458 }
@@ -1014,7 +1012,7 @@ namespace OpenSim.Region.Environment.Scenes
1014 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt, 1012 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,
1015 uint ItemFlags, uint NextOwnerMask) 1013 uint ItemFlags, uint NextOwnerMask)
1016 { 1014 {
1017 System.Console.WriteLine("RezSingleAttachment: unimplemented yet"); 1015 Console.WriteLine("RezSingleAttachment: unimplemented yet");
1018 } 1016 }
1019 } 1017 }
1020} 1018}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 7e2c9ff..8fdb468 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -29,8 +29,6 @@ using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30using libsecondlife.Packets; 30using libsecondlife.Packets;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.UserManagement;
33using OpenSim.Framework.Console;
34 32
35namespace OpenSim.Region.Environment.Scenes 33namespace OpenSim.Region.Environment.Scenes
36{ 34{
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a3f6948..6d8d481 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -40,11 +40,12 @@ using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Environment.Interfaces;
43using OpenSim.Region.Environment.Modules.Terrain;
43using OpenSim.Region.Environment.Scenes.Scripting; 44using OpenSim.Region.Environment.Scenes.Scripting;
44using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
45using Caps = OpenSim.Region.Capabilities.Caps; 46using Caps=OpenSim.Region.Capabilities.Caps;
46using Image = System.Drawing.Image; 47using Image=System.Drawing.Image;
47using Timer = System.Timers.Timer; 48using Timer=System.Timers.Timer;
48 49
49namespace OpenSim.Region.Environment.Scenes 50namespace OpenSim.Region.Environment.Scenes
50{ 51{
@@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
580 if (!avatar.IsChildAgent) 581 if (!avatar.IsChildAgent)
581 avatar.ControllingClient.Kick("The simulator is going down."); 582 avatar.ControllingClient.Kick("The simulator is going down.");
582 583
583 avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator), 584 avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator),
584 ThrottleOutPacketType.Task); 585 ThrottleOutPacketType.Task);
585 }); 586 });
586 587
@@ -755,17 +756,17 @@ namespace OpenSim.Region.Environment.Scenes
755 { 756 {
756 throw; 757 throw;
757 } 758 }
758 catch (System.AccessViolationException e) 759 catch (AccessViolationException e)
759 { 760 {
760 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); 761 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
761 762
762 } 763 }
763 catch (System.NullReferenceException e) 764 catch (NullReferenceException e)
764 { 765 {
765 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); 766 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
766 767
767 } 768 }
768 catch (System.InvalidOperationException e) 769 catch (InvalidOperationException e)
769 { 770 {
770 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); 771 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
771 772
@@ -941,13 +942,13 @@ namespace OpenSim.Region.Environment.Scenes
941 if (map == null) 942 if (map == null)
942 { 943 {
943 m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain."); 944 m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain.");
944 Heightmap = new Modules.Terrain.TerrainChannel(); 945 Heightmap = new TerrainChannel();
945 946
946 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); 947 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
947 } 948 }
948 else 949 else
949 { 950 {
950 Heightmap = new Modules.Terrain.TerrainChannel(map); 951 Heightmap = new TerrainChannel(map);
951 } 952 }
952 953
953 } 954 }
@@ -1094,7 +1095,7 @@ namespace OpenSim.Region.Environment.Scenes
1094 byte[] data; 1095 byte[] data;
1095 try 1096 try
1096 { 1097 {
1097 data = OpenJPEGNet.OpenJPEG.EncodeFromImage(mapbmp, false); 1098 data = OpenJPEG.EncodeFromImage(mapbmp, false);
1098 } 1099 }
1099 catch (Exception) 1100 catch (Exception)
1100 { 1101 {
@@ -1420,7 +1421,7 @@ namespace OpenSim.Region.Environment.Scenes
1420 { 1421 {
1421 DeleteSceneObjectGroup(grp); 1422 DeleteSceneObjectGroup(grp);
1422 } 1423 }
1423 catch (System.Exception) 1424 catch (Exception)
1424 { 1425 {
1425 m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border."); 1426 m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
1426 } 1427 }
@@ -1714,7 +1715,7 @@ namespace OpenSim.Region.Environment.Scenes
1714 { 1715 {
1715 client.SendKillObject(avatar.RegionHandle, avatar.LocalId); 1716 client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
1716 } 1717 }
1717 catch (System.NullReferenceException) 1718 catch (NullReferenceException)
1718 { 1719 {
1719 //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. 1720 //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway.
1720 } 1721 }
@@ -2041,7 +2042,7 @@ namespace OpenSim.Region.Environment.Scenes
2041 m_innerScene.removeUserCount(true); 2042 m_innerScene.removeUserCount(true);
2042 } 2043 }
2043 // Tell a single agent to disconnect from the region. 2044 // Tell a single agent to disconnect from the region.
2044 libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket)PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator); 2045 DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
2045 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown); 2046 presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown);
2046 presence.ControllingClient.Close(true); 2047 presence.ControllingClient.Close(true);
2047 } 2048 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5551173..d9dc1da 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -27,18 +27,18 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using OpenSim.Framework; 33using OpenSim.Framework;
32using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Terrain;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36 36
37namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Environment.Scenes
38{ 38{
39 public abstract class SceneBase : IScene 39 public abstract class SceneBase : IScene
40 { 40 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 #region Events 43 #region Events
44 44
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Environment.Scenes
204 /// <summary> 204 /// <summary>
205 /// XXX These two methods are very temporary 205 /// XXX These two methods are very temporary
206 /// </summary> 206 /// </summary>
207 protected Dictionary<LLUUID, String> capsPaths = new Dictionary<LLUUID, String>(); 207 protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
208 public string GetCapsPath(LLUUID agentId) 208 public string GetCapsPath(LLUUID agentId)
209 { 209 {
210 if (capsPaths.ContainsKey(agentId)) 210 if (capsPaths.ContainsKey(agentId))
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index db2327e..0062e4d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Region.Environment.Scenes 37namespace OpenSim.Region.Environment.Scenes
37{ 38{
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
41 42
42 public class SceneCommunicationService //one instance per region 43 public class SceneCommunicationService //one instance per region
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 protected CommunicationsManager m_commsProvider; 47 protected CommunicationsManager m_commsProvider;
47 protected RegionInfo m_regionInfo; 48 protected RegionInfo m_regionInfo;
@@ -416,7 +417,7 @@ namespace OpenSim.Region.Environment.Scenes
416 } 417 }
417 } 418 }
418 } 419 }
419 catch (System.InvalidOperationException) 420 catch (InvalidOperationException)
420 { 421 {
421 // We're ignoring a collection was modified error because this data gets old and outdated fast. 422 // We're ignoring a collection was modified error because this data gets old and outdated fast.
422 } 423 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 5cf8ece..c9c0ad6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -25,11 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife;
29using System; 28using System;
29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32using Caps = OpenSim.Region.Capabilities.Caps; 32using Caps=OpenSim.Region.Capabilities.Caps;
33 33
34namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
35{ 35{
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Scenes
155 public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps); 155 public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps);
156 public event DeregisterCapsEvent OnDeregisterCaps; 156 public event DeregisterCapsEvent OnDeregisterCaps;
157 157
158 public class MoneyTransferArgs : System.EventArgs 158 public class MoneyTransferArgs : EventArgs
159 { 159 {
160 public LLUUID sender; 160 public LLUUID sender;
161 public LLUUID receiver; 161 public LLUUID receiver;
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
176 } 176 }
177 } 177 }
178 178
179 public class LandBuyArgs : System.EventArgs 179 public class LandBuyArgs : EventArgs
180 { 180 {
181 public LLUUID agentId = LLUUID.Zero; 181 public LLUUID agentId = LLUUID.Zero;
182 182
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 102be30..61a4eae 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -28,10 +28,10 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Region.Environment.Scenes 36namespace OpenSim.Region.Environment.Scenes
37{ 37{
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
39 39
40 public class SceneManager 40 public class SceneManager
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 public event RestartSim OnRestartSim; 44 public event RestartSim OnRestartSim;
45 45
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 495b604..d9808e6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -25,19 +25,17 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System.Reflection;
29
30using libsecondlife; 29using libsecondlife;
31 30using log4net;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
35 33
36namespace OpenSim.Region.Environment.Scenes 34namespace OpenSim.Region.Environment.Scenes
37{ 35{
38 public partial class SceneObjectGroup : EntityBase 36 public partial class SceneObjectGroup : EntityBase
39 { 37 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 39
42 /// <summary> 40 /// <summary>
43 /// Start a given script. 41 /// Start a given script.
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 7abaaee..8651d7e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -29,13 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Text;
33using System.Xml; 32using System.Xml;
34using Axiom.Math; 33using Axiom.Math;
35using libsecondlife; 34using libsecondlife;
36using libsecondlife.Packets; 35using libsecondlife.Packets;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Console;
39using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Physics.Manager; 38using OpenSim.Region.Physics.Manager;
41 39
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 8ce71c4..72f78f3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Xml.Serialization; 30using System.Reflection;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes.Scripting; 36using OpenSim.Region.Environment.Scenes.Scripting;
39 37
@@ -41,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
41{ 39{
42 public partial class SceneObjectPart : IScriptHost 40 public partial class SceneObjectPart : IScriptHost
43 { 41 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 43
46 private string m_inventoryFileName = String.Empty; 44 private string m_inventoryFileName = String.Empty;
47 45
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 61d10c9..40a9fcf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -28,18 +28,16 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Runtime.Serialization;
32using System.Security.Permissions;
31using System.Xml; 33using System.Xml;
32using System.Xml.Serialization; 34using System.Xml.Serialization;
33using Axiom.Math; 35using Axiom.Math;
34using libsecondlife; 36using libsecondlife;
35using libsecondlife.Packets; 37using libsecondlife.Packets;
36using OpenSim.Framework; 38using OpenSim.Framework;
37using OpenSim.Framework.Console;
38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes.Scripting; 39using OpenSim.Region.Environment.Scenes.Scripting;
40using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
41using System.Runtime.Serialization;
42using System.Security.Permissions;
43 41
44namespace OpenSim.Region.Environment.Scenes 42namespace OpenSim.Region.Environment.Scenes
45{ 43{
@@ -324,7 +322,7 @@ namespace OpenSim.Region.Environment.Scenes
324 ParentGroup.ResetChildPrimPhysicsPositions(); 322 ParentGroup.ResetChildPrimPhysicsPositions();
325 323
326 } 324 }
327 catch (System.NullReferenceException) 325 catch (NullReferenceException)
328 { 326 {
329 // Ignore, and skip over. 327 // Ignore, and skip over.
330 } 328 }
@@ -2326,7 +2324,7 @@ namespace OpenSim.Region.Environment.Scenes
2326 2324
2327 if (info == null) 2325 if (info == null)
2328 { 2326 {
2329 throw new System.ArgumentNullException("info"); 2327 throw new ArgumentNullException("info");
2330 } 2328 }
2331 2329
2332 /* 2330 /*
@@ -2344,7 +2342,7 @@ namespace OpenSim.Region.Environment.Scenes
2344 { 2342 {
2345 if (info == null) 2343 if (info == null)
2346 { 2344 {
2347 throw new System.ArgumentNullException("info"); 2345 throw new ArgumentNullException("info");
2348 } 2346 }
2349 2347
2350 info.AddValue("m_inventoryFileName", m_inventoryFileName); 2348 info.AddValue("m_inventoryFileName", m_inventoryFileName);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8b8373d..d85eea6 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -27,16 +27,16 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Runtime.Serialization;
32using System.Security.Permissions;
30using Axiom.Math; 33using Axiom.Math;
31using libsecondlife; 34using libsecondlife;
32using libsecondlife.Packets; 35using libsecondlife.Packets;
36using log4net;
33using OpenSim.Framework; 37using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Types; 38using OpenSim.Region.Environment.Types;
36using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
37using OpenSim.Region.Environment.Interfaces;
38using System.Runtime.Serialization;
39using System.Security.Permissions;
40 40
41namespace OpenSim.Region.Environment.Scenes 41namespace OpenSim.Region.Environment.Scenes
42{ 42{
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Scenes
48// System.Console.WriteLine("[ScenePresence] Destructor called"); 48// System.Console.WriteLine("[ScenePresence] Destructor called");
49// } 49// }
50 50
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public static AvatarAnimations Animations = new AvatarAnimations(); 53 public static AvatarAnimations Animations = new AvatarAnimations();
54 public static byte[] DefaultTexture; 54 public static byte[] DefaultTexture;
@@ -1746,7 +1746,7 @@ namespace OpenSim.Region.Environment.Scenes
1746 movementvector.Z = force.Z; 1746 movementvector.Z = force.Z;
1747 Velocity = movementvector; 1747 Velocity = movementvector;
1748 } 1748 }
1749 catch (System.NullReferenceException) 1749 catch (NullReferenceException)
1750 { 1750 {
1751 // Under extreme load, this returns a NullReference Exception that we can ignore. 1751 // Under extreme load, this returns a NullReference Exception that we can ignore.
1752 // Ignoring this causes no movement to be sent to the physics engine... 1752 // Ignoring this causes no movement to be sent to the physics engine...
@@ -1800,7 +1800,7 @@ namespace OpenSim.Region.Environment.Scenes
1800 1800
1801 if (info == null) 1801 if (info == null)
1802 { 1802 {
1803 throw new System.ArgumentNullException("info"); 1803 throw new ArgumentNullException("info");
1804 } 1804 }
1805 1805
1806 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid))); 1806 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid)));
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.Environment.Scenes
1817 { 1817 {
1818 if (info == null) 1818 if (info == null)
1819 { 1819 {
1820 throw new System.ArgumentNullException("info"); 1820 throw new ArgumentNullException("info");
1821 } 1821 }
1822 1822
1823 info.AddValue("FullID", FullID.UUID); 1823 info.AddValue("FullID", FullID.UUID);
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Environment.Scenes
1928 1928
1929 if (info == null) 1929 if (info == null)
1930 { 1930 {
1931 throw new System.ArgumentNullException("info"); 1931 throw new ArgumentNullException("info");
1932 } 1932 }
1933/* JB 1933/* JB
1934 if (Animations == null) 1934 if (Animations == null)
@@ -2100,7 +2100,7 @@ namespace OpenSim.Region.Environment.Scenes
2100 { 2100 {
2101 if (info == null) 2101 if (info == null)
2102 { 2102 {
2103 throw new System.ArgumentNullException("info"); 2103 throw new ArgumentNullException("info");
2104 } 2104 }
2105 2105
2106 base.GetObjectData(info, context); 2106 base.GetObjectData(info, context);
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index 18b3f46..b1ee519 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Framework.Console;
29
30//TODO: WHERE TO PLACE THIS? 28//TODO: WHERE TO PLACE THIS?
31 29
32namespace OpenSim.Region.Environment.Scenes.Scripting 30namespace OpenSim.Region.Environment.Scenes.Scripting
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 7dee2e4..6216e2c 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -29,13 +29,13 @@
29using System; 29using System;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Framework.Console; 32using log4net;
33 33
34namespace OpenSim.Region.Environment.Scenes.Scripting 34namespace OpenSim.Region.Environment.Scenes.Scripting
35{ 35{
36 public class ScriptEngineLoader 36 public class ScriptEngineLoader
37 { 37 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 39
40 public ScriptEngineInterface LoadScriptEngine(string EngineName) 40 public ScriptEngineInterface LoadScriptEngine(string EngineName)
41 { 41 {
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index 4cbadba..b9a42a2 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -27,14 +27,14 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenSim.Framework.Console; 30using log4net;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32 32
33namespace OpenSim.Region.Environment 33namespace OpenSim.Region.Environment
34{ 34{
35 public class StorageManager 35 public class StorageManager
36 { 36 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 38
39 private IRegionDataStore m_dataStore; 39 private IRegionDataStore m_dataStore;
40 40
diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
index f1f2302..24ce94b 100644
--- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
30 31
@@ -261,7 +262,7 @@ namespace OpenSim.Region.Environment.Types
261 public string[] GetNeighbours(string nodeName) 262 public string[] GetNeighbours(string nodeName)
262 { 263 {
263 string[] retVal = new string[1]; 264 string[] retVal = new string[1];
264 retVal[0] = System.String.Empty; 265 retVal[0] = String.Empty;
265 return retVal; 266 return retVal;
266 } 267 }
267 } 268 }
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs
index 4d273ce..ec1ffd2 100644
--- a/OpenSim/Region/Environment/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Environment/Types/UpdateQueue.cs
@@ -25,13 +25,12 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using libsecondlife;
30using OpenSim.Region.Environment.Scenes;
31
32using System;
33using System.Runtime.Serialization; 30using System.Runtime.Serialization;
34using System.Security.Permissions; 31using System.Security.Permissions;
32using libsecondlife;
33using OpenSim.Region.Environment.Scenes;
35 34
36namespace OpenSim.Region.Environment.Types 35namespace OpenSim.Region.Environment.Types
37{ 36{
@@ -97,7 +96,7 @@ namespace OpenSim.Region.Environment.Types
97 96
98 if (info == null) 97 if (info == null)
99 { 98 {
100 throw new System.ArgumentNullException("info"); 99 throw new ArgumentNullException("info");
101 } 100 }
102 101
103 m_queue = (Queue<SceneObjectPart>)info.GetValue("m_queue", typeof(Queue<SceneObjectPart>)); 102 m_queue = (Queue<SceneObjectPart>)info.GetValue("m_queue", typeof(Queue<SceneObjectPart>));
@@ -118,7 +117,7 @@ namespace OpenSim.Region.Environment.Types
118 { 117 {
119 if (info == null) 118 if (info == null)
120 { 119 {
121 throw new System.ArgumentNullException("info"); 120 throw new ArgumentNullException("info");
122 } 121 }
123 122
124 List<Guid> ids_work = new List<Guid>(); 123 List<Guid> ids_work = new List<Guid>();
generated by cgit v1.1 at 2024-11-09 06:56:25 +0000