diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Modules | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
29 files changed, 124 insertions, 124 deletions
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
31 | using Nini.Config; | 33 | using Nini.Config; |
32 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Interfaces; | 35 | using 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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | using System.Threading; | ||
31 | using libsecondlife; | 29 | using libsecondlife; |
32 | using libsecondlife.Packets; | 30 | using libsecondlife.Packets; |
33 | using Nini.Config; | 31 | using 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
32 | using Nini.Config; | 33 | using Nini.Config; |
33 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Region.Capabilities; | 38 | using OpenSim.Region.Capabilities; |
38 | using Caps = OpenSim.Region.Capabilities.Caps; | ||
39 | using OpenSim.Region.Environment.Interfaces; | 39 | using OpenSim.Region.Environment.Interfaces; |
40 | using OpenSim.Region.Environment.Scenes; | 40 | using OpenSim.Region.Environment.Scenes; |
41 | using Caps=OpenSim.Region.Capabilities.Caps; | ||
41 | 42 | ||
42 | namespace OpenSim.Region.Environment.Modules | 43 | namespace 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 | ||
28 | using System; | ||
29 | using System.Reflection; | ||
28 | using libsecondlife; | 30 | using libsecondlife; |
31 | using log4net; | ||
29 | using Nini.Config; | 32 | using Nini.Config; |
30 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Interfaces; | 34 | using 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; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Net.Sockets; | 32 | using System.Net.Sockets; |
33 | using System.Reflection; | ||
33 | using System.Xml; | 34 | using System.Xml; |
34 | using libsecondlife; | 35 | using libsecondlife; |
36 | using log4net; | ||
35 | using Nini.Config; | 37 | using Nini.Config; |
38 | using Nwc.XmlRpc; | ||
36 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
37 | using OpenSim.Region.Environment.Interfaces; | 40 | using OpenSim.Region.Environment.Interfaces; |
38 | using OpenSim.Region.Environment.Scenes; | 41 | using OpenSim.Region.Environment.Scenes; |
39 | using Nwc.XmlRpc; | ||
40 | |||
41 | using MoneyTransferArgs = OpenSim.Region.Environment.Scenes.EventManager.MoneyTransferArgs; | ||
42 | using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; | ||
43 | 42 | ||
44 | namespace OpenSim.Region.Environment.Modules | 43 | namespace 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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net.Sockets; | 31 | using System.Net.Sockets; |
32 | using System.Reflection; | ||
32 | using System.Text.RegularExpressions; | 33 | using System.Text.RegularExpressions; |
33 | using System.Threading; | 34 | using System.Threading; |
34 | using libsecondlife; | 35 | using libsecondlife; |
36 | using log4net; | ||
35 | using Nini.Config; | 37 | using Nini.Config; |
36 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
37 | using OpenSim.Region.Environment.Interfaces; | 39 | using 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using libsecondlife; | ||
31 | using Nini.Config; | 29 | using Nini.Config; |
32 | using OpenSim.Framework; | ||
33 | using OpenSim.Region.Environment.Interfaces; | 30 | using OpenSim.Region.Environment.Interfaces; |
34 | using OpenSim.Region.Environment.Scenes; | ||
35 | using OpenSim.Region.Environment.Modules.ModuleFramework; | 31 | using OpenSim.Region.Environment.Modules.ModuleFramework; |
32 | using OpenSim.Region.Environment.Scenes; | ||
36 | 33 | ||
37 | namespace OpenSim.Region.Environment.Modules | 34 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Drawing; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | ||
31 | using System.Drawing.Imaging; | ||
31 | using libsecondlife; | 32 | using libsecondlife; |
32 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenJPEGNet; | ||
33 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
36 | using OpenJPEGNet; | ||
37 | 38 | ||
38 | namespace OpenSim.Region.Environment.Modules | 39 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | 30 | using System.IO; |
31 | using libsecondlife; | ||
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 32 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | ||
36 | using OpenSim.Region.Environment.Modules.ModuleFramework; | 33 | using OpenSim.Region.Environment.Modules.ModuleFramework; |
37 | using System.IO; | 34 | using OpenSim.Region.Environment.Scenes; |
38 | 35 | ||
39 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 36 | namespace 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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | using OpenSim.Region.Environment.Scenes; | 28 | using OpenSim.Region.Environment.Scenes; |
33 | 29 | ||
34 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 30 | namespace 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 | ||
28 | using System; | 28 | using System.Collections.Generic; |
29 | using OpenSim.Region.Environment.Scenes; | ||
30 | |||
29 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 31 | namespace 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 | ||
28 | using OpenSim.Region.Environment.Scenes; | ||
29 | using System.IO; | ||
30 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | ||
30 | using System.Text; | ||
31 | using System.Xml; | 31 | using System.Xml; |
32 | using OpenSim.Region.Environment.Scenes; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 34 | namespace 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 | ||
28 | using OpenSim.Region.Environment.Modules.Terrain; | 28 | using OpenSim.Region.Environment.Modules.Terrain; |
29 | using OpenSim.Region.Environment.Modules.Terrain.FileLoaders; | ||
29 | using OpenSim.Region.Environment.Scenes; | 30 | using OpenSim.Region.Environment.Scenes; |
30 | 31 | ||
31 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 32 | namespace 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 | */ |
27 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | ||
29 | using libsecondlife; | 30 | using libsecondlife; |
30 | using libsecondlife.Packets; | 31 | using libsecondlife.Packets; |
32 | using log4net; | ||
31 | using Nini.Config; | 33 | using Nini.Config; |
32 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
33 | using OpenSim.Framework; | 35 | using 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
31 | using Nini.Config; | 33 | using Nini.Config; |
32 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Interfaces; | 35 | using 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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | 29 | using System.Reflection; | |
31 | using libsecondlife; | 30 | using libsecondlife; |
31 | using log4net; | ||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | |||
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
35 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | 35 | using 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | ||
31 | using Axiom.Math; | 30 | using Axiom.Math; |
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | ||
38 | using OpenSim.Region.Physics.Manager; | 36 | using OpenSim.Region.Physics.Manager; |
39 | 37 | ||
40 | using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; | ||
41 | |||
42 | namespace OpenSim.Region.Environment.Modules.LandManagement | 38 | namespace 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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using libsecondlife; | ||
31 | using libsecondlife.Packets; | ||
32 | using OpenSim.Framework; | ||
33 | using OpenSim.Framework.Console; | ||
34 | using OpenSim.Region.Environment.Scenes; | ||
35 | using OpenSim.Region.Environment.Interfaces; | ||
36 | using Nini.Config; | 28 | using Nini.Config; |
37 | 29 | using OpenSim.Region.Environment.Interfaces; | |
38 | using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; | 30 | using OpenSim.Region.Environment.Scenes; |
39 | 31 | ||
40 | namespace OpenSim.Region.Environment.Modules.LandManagement | 32 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
31 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | using log4net; | ||
32 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Console; | ||
34 | using OpenSim.Region.Environment.Scenes; | ||
35 | using OpenSim.Region.Environment.Interfaces; | 35 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | ||
36 | 37 | ||
37 | namespace OpenSim.Region.Environment.Modules.LandManagement | 38 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using System.Text; | 31 | using System.Text; |
31 | 32 | using log4net; | |
33 | using OpenSim.Framework; | ||
32 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
33 | 35 | ||
34 | namespace OpenSim.Region.Environment.Modules.ModuleFramework | 36 | namespace 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; | |||
33 | using System.Threading; | 33 | using System.Threading; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using OpenSim.Framework; | ||
36 | using OpenSim.Region.Environment.Interfaces; | 37 | using OpenSim.Region.Environment.Interfaces; |
37 | using OpenSim.Region.Environment.Scenes; | 38 | using 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 | ||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using System.Reflection; |
30 | using libsecondlife.Packets; | 30 | using libsecondlife.Packets; |
31 | using log4net; | ||
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Console; | ||
33 | using OpenSim.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules | 35 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using System.Timers; | ||
32 | using Axiom.Math; | ||
30 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
31 | using Nini.Config; | 35 | using Nini.Config; |
32 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Console; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 37 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 38 | using 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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | 29 | using System.Reflection; | |
31 | using libsecondlife; | 30 | using libsecondlife; |
32 | using libsecondlife.Packets; | 31 | using log4net; |
33 | |||
34 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications.Limit; | 33 | using OpenSim.Framework.Communications.Limit; |
36 | using OpenSim.Framework.Console; | ||
37 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
38 | using OpenSim.Region.Environment.Scenes; | 35 | using 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Drawing; | 29 | using System.Drawing; |
30 | using System.Drawing.Imaging; | ||
31 | using System.Globalization; | ||
30 | using System.IO; | 32 | using System.IO; |
31 | using System.Net; | 33 | using System.Net; |
32 | using System.Globalization; | ||
33 | using libsecondlife; | 34 | using libsecondlife; |
34 | using Nini.Config; | 35 | using Nini.Config; |
35 | using OpenJPEGNet; | 36 | using OpenJPEGNet; |
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.Environment.Interfaces; | 37 | using OpenSim.Region.Environment.Interfaces; |
38 | using OpenSim.Region.Environment.Scenes; | 38 | using OpenSim.Region.Environment.Scenes; |
39 | using Image=System.Drawing.Image; | ||
40 | |||
39 | //using Cairo; | 41 | //using Cairo; |
40 | 42 | ||
41 | namespace OpenSim.Region.Environment.Modules | 43 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
32 | using Nini.Config; | 33 | using Nini.Config; |
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Region.Capabilities; | 37 | using OpenSim.Region.Capabilities; |
37 | using Caps = OpenSim.Region.Capabilities.Caps; | ||
38 | using OpenSim.Region.Environment.Interfaces; | 38 | using OpenSim.Region.Environment.Interfaces; |
39 | using OpenSim.Region.Environment.Scenes; | 39 | using OpenSim.Region.Environment.Scenes; |
40 | using Caps=OpenSim.Region.Capabilities.Caps; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Environment.Modules | 42 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using libsecondlife; | 30 | using libsecondlife; |
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using OpenSim.Framework; | 32 | using 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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | ||
32 | using System.Reflection; | ||
31 | using System.Threading; | 33 | using System.Threading; |
32 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | ||
33 | using Nini.Config; | 36 | using Nini.Config; |
34 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
35 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Region.Environment.Interfaces; | 40 | using OpenSim.Region.Environment.Interfaces; |
38 | using OpenSim.Region.Environment.Scenes; | 41 | using 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"); |