diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
18 files changed, 216 insertions, 257 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index d084dbd..38b9dca 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -25,19 +25,16 @@ | |||
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; |
29 | using System.Collections.Generic; | 29 | using System.Reflection; |
30 | using System.Reflection; | 30 | using log4net; |
31 | 31 | using Nini.Config; | |
32 | using System.Threading; | 32 | using OpenMetaverse; |
33 | using OpenMetaverse; | 33 | using OpenSim.Framework; |
34 | using log4net; | 34 | using OpenSim.Framework.Communications.Cache; |
35 | using Nini.Config; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | |
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | |||
41 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | 38 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory |
42 | { | 39 | { |
43 | public class AvatarFactoryModule : IAvatarFactory, IRegionModule | 40 | public class AvatarFactoryModule : IAvatarFactory, IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index f036faf..323cb69 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -25,20 +25,16 @@ | |||
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; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.Reflection; |
31 | using System.Net.Sockets; | 31 | using log4net; |
32 | using System.Reflection; | 32 | using Nini.Config; |
33 | using System.Text.RegularExpressions; | 33 | using OpenMetaverse; |
34 | using System.Threading; | 34 | using OpenSim.Framework; |
35 | using OpenMetaverse; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using log4net; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using Nini.Config; | 37 | |
38 | using OpenSim.Framework; | ||
39 | using OpenSim.Region.Framework.Interfaces; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.Chat | 38 | namespace OpenSim.Region.CoreModules.Avatar.Chat |
43 | { | 39 | { |
44 | public class ChatModule : IRegionModule | 40 | public class ChatModule : IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 1ed608a..f4dffb5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -25,22 +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; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections.Generic; |
30 | using System.Collections.Generic; | 30 | using Nini.Config; |
31 | using System.Net; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | using System.Net.Sockets; | 32 | using OpenSim.Region.Framework.Scenes; |
33 | using System.Reflection; | 33 | |
34 | using System.Xml; | ||
35 | using OpenMetaverse; | ||
36 | using log4net; | ||
37 | using Nini.Config; | ||
38 | using Nwc.XmlRpc; | ||
39 | using OpenSim.Framework; | ||
40 | using OpenSim.Region.Framework.Interfaces; | ||
41 | using OpenSim.Region.Framework.Scenes; | ||
42 | using OpenSim.Framework.Communications.Cache; | ||
43 | |||
44 | namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | 34 | namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule |
45 | { | 35 | { |
46 | public class CombatModule : IRegionModule | 36 | public class CombatModule : IRegionModule |
@@ -117,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
117 | foundResult = true; | 107 | foundResult = true; |
118 | } | 108 | } |
119 | } | 109 | } |
120 | } catch (System.InvalidOperationException) | 110 | } catch (InvalidOperationException) |
121 | { | 111 | { |
122 | 112 | ||
123 | } | 113 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 0a1de44..4ea9958 100644 --- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -25,23 +25,23 @@ | |||
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; |
29 | using System.Collections; | 29 | 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.Reflection; |
34 | using System.Xml; | 34 | using System.Xml; |
35 | using log4net; | 35 | using log4net; |
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
38 | using OpenMetaverse; | 38 | using OpenMetaverse; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
41 | using OpenSim.Framework.Servers; | 41 | using OpenSim.Framework.Servers; |
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | 44 | ||
45 | namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney | 45 | namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney |
46 | { | 46 | { |
47 | /// <summary> | 47 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 7326373..6dbc774 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -25,15 +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.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using Nini.Config; |
30 | using log4net; | 30 | using OpenMetaverse; |
31 | using Nini.Config; | 31 | using OpenSim.Framework; |
32 | using OpenMetaverse; | 32 | using OpenSim.Region.Framework.Interfaces; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | |
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | |||
37 | namespace OpenSim.Region.CoreModules.Avatar.Dialog | 35 | namespace OpenSim.Region.CoreModules.Avatar.Dialog |
38 | { | 36 | { |
39 | public class DialogModule : IRegionModule, IDialogModule | 37 | public class DialogModule : IRegionModule, IDialogModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index fb4d08a..98683b7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -25,20 +25,19 @@ | |||
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; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using OpenMetaverse; | 32 | using log4net; |
33 | using log4net; | 33 | using Nini.Config; |
34 | using Nini.Config; | 34 | using Nwc.XmlRpc; |
35 | using Nwc.XmlRpc; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | |
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.Friends | 41 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
43 | { | 42 | { |
44 | /* | 43 | /* |
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index a3a642f..d2bd803 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | |||
@@ -25,16 +25,15 @@ | |||
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 log4net; | 28 | using System.Reflection; |
29 | using Nini.Config; | 29 | using log4net; |
30 | using OpenMetaverse; | 30 | using Nini.Config; |
31 | using OpenSim.Framework; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework.Communications; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using System.Reflection; | 36 | |
37 | |||
38 | namespace OpenSim.Region.CoreModules.Avatar.Gestures | 37 | namespace OpenSim.Region.CoreModules.Avatar.Gestures |
39 | { | 38 | { |
40 | public class GesturesModule : IRegionModule | 39 | public class GesturesModule : IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs index 92d0fdd..4786cab 100644 --- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | |||
@@ -25,16 +25,15 @@ | |||
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 System.Collections.Generic; | 29 | using System.Reflection; |
30 | using System.Reflection; | 30 | using log4net; |
31 | using OpenMetaverse; | 31 | using Nini.Config; |
32 | using log4net; | 32 | using OpenMetaverse; |
33 | using Nini.Config; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | |
37 | |||
38 | namespace OpenSim.Region.CoreModules.Avatar.Groups | 37 | namespace OpenSim.Region.CoreModules.Avatar.Groups |
39 | { | 38 | { |
40 | public class GroupsModule : IRegionModule | 39 | public class GroupsModule : IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 3ad2c91..7556388 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -24,21 +24,16 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System; | 27 | using System.Collections.Generic; |
28 | using System.Collections; | 28 | using System.Reflection; |
29 | using System.Collections.Generic; | 29 | using log4net; |
30 | using System.Reflection; | 30 | using Nini.Config; |
31 | using System.Net; | 31 | using OpenMetaverse; |
32 | using System.Threading; | 32 | using OpenSim.Framework; |
33 | using OpenMetaverse; | 33 | using OpenSim.Framework.Client; |
34 | using log4net; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using Nini.Config; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using Nwc.XmlRpc; | 36 | |
37 | using OpenSim.Framework; | ||
38 | using OpenSim.Framework.Client; | ||
39 | using OpenSim.Region.Framework.Interfaces; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | 37 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 38 | { |
44 | public class InstantMessageModule : IRegionModule | 39 | public class InstantMessageModule : IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 91c22eb..beff362 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -24,21 +24,19 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System; | 27 | using System; |
28 | using System.Collections; | 28 | using System.Collections; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Net; |
31 | using System.Net; | 31 | using System.Reflection; |
32 | using System.Threading; | 32 | using log4net; |
33 | using OpenMetaverse; | 33 | using Nini.Config; |
34 | using log4net; | 34 | using Nwc.XmlRpc; |
35 | using Nini.Config; | 35 | using OpenMetaverse; |
36 | using Nwc.XmlRpc; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Framework.Client; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | |
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | 40 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 41 | { |
44 | public class MessageTransferModule : IRegionModule, IMessageTransferModule | 42 | public class MessageTransferModule : IRegionModule, IMessageTransferModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 49fd70a..3f41457 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | |||
@@ -24,21 +24,18 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System; | 27 | using System.Collections; |
28 | using System.Collections; | 28 | using System.Collections.Generic; |
29 | using System.Collections.Generic; | 29 | using System.Net; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Net; | 31 | using log4net; |
32 | using System.Threading; | 32 | using Nini.Config; |
33 | using OpenMetaverse; | 33 | using Nwc.XmlRpc; |
34 | using log4net; | 34 | using OpenMetaverse; |
35 | using Nini.Config; | 35 | using OpenSim.Framework; |
36 | using Nwc.XmlRpc; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Framework.Client; | 38 | |
39 | using OpenSim.Region.Framework.Interfaces; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | 39 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 40 | { |
44 | public class PresenceModule : IRegionModule, IPresenceModule | 41 | public class PresenceModule : IRegionModule, IPresenceModule |
@@ -344,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
344 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); | 341 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); |
345 | } | 342 | } |
346 | } | 343 | } |
347 | catch (System.Net.WebException) | 344 | catch (WebException) |
348 | { | 345 | { |
349 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); | 346 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName); |
350 | } | 347 | } |
@@ -367,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
367 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); | 364 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); |
368 | } | 365 | } |
369 | } | 366 | } |
370 | catch (System.Net.WebException) | 367 | catch (WebException) |
371 | { | 368 | { |
372 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); | 369 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName); |
373 | } | 370 | } |
@@ -392,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
392 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); | 389 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); |
393 | } | 390 | } |
394 | } | 391 | } |
395 | catch (System.Net.WebException) | 392 | catch (WebException) |
396 | { | 393 | { |
397 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); | 394 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString()); |
398 | } | 395 | } |
@@ -417,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
417 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); | 414 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); |
418 | } | 415 | } |
419 | } | 416 | } |
420 | catch (System.Net.WebException) | 417 | catch (WebException) |
421 | { | 418 | { |
422 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); | 419 | m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString()); |
423 | } | 420 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index c5cffa3..5ae5b4b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -25,22 +25,20 @@ | |||
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; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.IO.Compression; | 31 | using System.IO.Compression; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Xml; | 33 | using System.Text; |
34 | using OpenMetaverse; | 34 | using System.Xml; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using log4net; |
36 | using OpenSim.Region.CoreModules.World.Archiver; | 36 | using OpenMetaverse; |
37 | using OpenSim.Region.CoreModules.World.Serialiser; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Region.CoreModules.World.Archiver; |
41 | using log4net; | 41 | |
42 | |||
43 | |||
44 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 42 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
45 | { | 43 | { |
46 | public class InventoryArchiveReadRequest | 44 | public class InventoryArchiveReadRequest |
@@ -48,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 47 | ||
50 | protected TarArchiveReader archive; | 48 | protected TarArchiveReader archive; |
51 | private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); | 49 | private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
52 | 50 | ||
53 | private string m_firstName; | 51 | private string m_firstName; |
54 | private string m_lastName; | 52 | private string m_lastName; |
@@ -98,13 +96,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
98 | item.ID = UUID.Parse(reader.ReadString()); | 96 | item.ID = UUID.Parse(reader.ReadString()); |
99 | reader.ReadEndElement(); | 97 | reader.ReadEndElement(); |
100 | reader.ReadStartElement("InvType"); | 98 | reader.ReadStartElement("InvType"); |
101 | item.InvType = System.Convert.ToInt32(reader.ReadString()); | 99 | item.InvType = Convert.ToInt32(reader.ReadString()); |
102 | reader.ReadEndElement(); | 100 | reader.ReadEndElement(); |
103 | reader.ReadStartElement("CreatorUUID"); | 101 | reader.ReadStartElement("CreatorUUID"); |
104 | item.Creator = UUID.Parse(reader.ReadString()); | 102 | item.Creator = UUID.Parse(reader.ReadString()); |
105 | reader.ReadEndElement(); | 103 | reader.ReadEndElement(); |
106 | reader.ReadStartElement("CreationDate"); | 104 | reader.ReadStartElement("CreationDate"); |
107 | item.CreationDate = System.Convert.ToInt32(reader.ReadString()); | 105 | item.CreationDate = Convert.ToInt32(reader.ReadString()); |
108 | reader.ReadEndElement(); | 106 | reader.ReadEndElement(); |
109 | reader.ReadStartElement("Owner"); | 107 | reader.ReadStartElement("Owner"); |
110 | item.Owner = UUID.Parse(reader.ReadString()); | 108 | item.Owner = UUID.Parse(reader.ReadString()); |
@@ -121,37 +119,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
121 | reader.ReadEndElement(); | 119 | reader.ReadEndElement(); |
122 | } | 120 | } |
123 | reader.ReadStartElement("AssetType"); | 121 | reader.ReadStartElement("AssetType"); |
124 | item.AssetType = System.Convert.ToInt32(reader.ReadString()); | 122 | item.AssetType = Convert.ToInt32(reader.ReadString()); |
125 | reader.ReadEndElement(); | 123 | reader.ReadEndElement(); |
126 | reader.ReadStartElement("AssetID"); | 124 | reader.ReadStartElement("AssetID"); |
127 | item.AssetID = UUID.Parse(reader.ReadString()); | 125 | item.AssetID = UUID.Parse(reader.ReadString()); |
128 | reader.ReadEndElement(); | 126 | reader.ReadEndElement(); |
129 | reader.ReadStartElement("SaleType"); | 127 | reader.ReadStartElement("SaleType"); |
130 | item.SaleType = System.Convert.ToByte(reader.ReadString()); | 128 | item.SaleType = Convert.ToByte(reader.ReadString()); |
131 | reader.ReadEndElement(); | 129 | reader.ReadEndElement(); |
132 | reader.ReadStartElement("SalePrice"); | 130 | reader.ReadStartElement("SalePrice"); |
133 | item.SalePrice = System.Convert.ToInt32(reader.ReadString()); | 131 | item.SalePrice = Convert.ToInt32(reader.ReadString()); |
134 | reader.ReadEndElement(); | 132 | reader.ReadEndElement(); |
135 | reader.ReadStartElement("BasePermissions"); | 133 | reader.ReadStartElement("BasePermissions"); |
136 | item.BasePermissions = System.Convert.ToUInt32(reader.ReadString()); | 134 | item.BasePermissions = Convert.ToUInt32(reader.ReadString()); |
137 | reader.ReadEndElement(); | 135 | reader.ReadEndElement(); |
138 | reader.ReadStartElement("CurrentPermissions"); | 136 | reader.ReadStartElement("CurrentPermissions"); |
139 | item.CurrentPermissions = System.Convert.ToUInt32(reader.ReadString()); | 137 | item.CurrentPermissions = Convert.ToUInt32(reader.ReadString()); |
140 | reader.ReadEndElement(); | 138 | reader.ReadEndElement(); |
141 | reader.ReadStartElement("EveryOnePermssions"); | 139 | reader.ReadStartElement("EveryOnePermssions"); |
142 | item.EveryOnePermissions = System.Convert.ToUInt32(reader.ReadString()); | 140 | item.EveryOnePermissions = Convert.ToUInt32(reader.ReadString()); |
143 | reader.ReadEndElement(); | 141 | reader.ReadEndElement(); |
144 | reader.ReadStartElement("NextPermissions"); | 142 | reader.ReadStartElement("NextPermissions"); |
145 | item.NextPermissions = System.Convert.ToUInt32(reader.ReadString()); | 143 | item.NextPermissions = Convert.ToUInt32(reader.ReadString()); |
146 | reader.ReadEndElement(); | 144 | reader.ReadEndElement(); |
147 | reader.ReadStartElement("Flags"); | 145 | reader.ReadStartElement("Flags"); |
148 | item.Flags = System.Convert.ToUInt32(reader.ReadString()); | 146 | item.Flags = Convert.ToUInt32(reader.ReadString()); |
149 | reader.ReadEndElement(); | 147 | reader.ReadEndElement(); |
150 | reader.ReadStartElement("GroupID"); | 148 | reader.ReadStartElement("GroupID"); |
151 | item.GroupID = UUID.Parse(reader.ReadString()); | 149 | item.GroupID = UUID.Parse(reader.ReadString()); |
152 | reader.ReadEndElement(); | 150 | reader.ReadEndElement(); |
153 | reader.ReadStartElement("GroupOwned"); | 151 | reader.ReadStartElement("GroupOwned"); |
154 | item.GroupOwned = System.Convert.ToBoolean(reader.ReadString()); | 152 | item.GroupOwned = Convert.ToBoolean(reader.ReadString()); |
155 | reader.ReadEndElement(); | 153 | reader.ReadEndElement(); |
156 | //reader.ReadStartElement("ParentFolderID"); | 154 | //reader.ReadStartElement("ParentFolderID"); |
157 | //item.Folder = UUID.Parse(reader.ReadString()); | 155 | //item.Folder = UUID.Parse(reader.ReadString()); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index bfa4de9..da4785b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -25,20 +25,19 @@ | |||
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; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.IO.Compression; | 31 | using System.IO.Compression; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Xml; | 33 | using System.Xml; |
34 | using OpenMetaverse; | 34 | using log4net; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenMetaverse; |
36 | using OpenSim.Region.CoreModules.World.Archiver; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework.Communications; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Region.CoreModules.World.Archiver; |
40 | using log4net; | 40 | |
41 | |||
42 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 41 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
43 | { | 42 | { |
44 | public class InventoryArchiveWriteRequest | 43 | public class InventoryArchiveWriteRequest |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index a684b69..b025a31 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -25,17 +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 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | 38 | ||
39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index d2cf6c9..98d952c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -25,18 +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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections.Generic; |
30 | using System.Collections.Generic; | 30 | using System.Reflection; |
31 | using System.Reflection; | 31 | using log4net; |
32 | using OpenMetaverse; | 32 | using Nini.Config; |
33 | using log4net; | 33 | using OpenMetaverse; |
34 | using Nini.Config; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Framework.Communications.Cache; | 38 | |
39 | |||
40 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | 39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer |
41 | { | 40 | { |
42 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule | 41 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index ebf4f0a..c0e4b48 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -25,21 +25,16 @@ | |||
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; |
29 | using System.Collections; | 29 | using System.Collections.Generic; |
30 | using System.Collections.Generic; | 30 | using System.Reflection; |
31 | using System.Reflection; | 31 | using log4net; |
32 | using System.Net; | 32 | using Nini.Config; |
33 | using System.Threading; | 33 | using OpenMetaverse; |
34 | using OpenMetaverse; | 34 | using OpenSim.Framework; |
35 | using log4net; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using Nini.Config; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using Nwc.XmlRpc; | 37 | |
38 | using OpenSim.Framework; | ||
39 | using OpenSim.Framework.Client; | ||
40 | using OpenSim.Region.Framework.Interfaces; | ||
41 | using OpenSim.Region.Framework.Scenes; | ||
42 | |||
43 | namespace OpenSim.Region.CoreModules.Avatar.Lure | 38 | namespace OpenSim.Region.CoreModules.Avatar.Lure |
44 | { | 39 | { |
45 | public class LureModule : IRegionModule | 40 | public class LureModule : IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index 193307d..ab65f8e 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -25,19 +25,19 @@ | |||
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; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenMetaverse.StructuredData; | 34 | using OpenMetaverse.StructuredData; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 39 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; |
40 | 40 | ||
41 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | 41 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps |
42 | { | 42 | { |
43 | public class ObjectAdd : IRegionModule | 43 | public class ObjectAdd : IRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index 6ea5b56..74e5b4b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -25,16 +25,16 @@ | |||
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; |
29 | using System.Globalization; | 29 | using System.Globalization; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenMetaverse; | 31 | using log4net; |
32 | using log4net; | 32 | using Nini.Config; |
33 | using Nini.Config; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.CoreModules.Avatar.Profiles | 38 | namespace OpenSim.Region.CoreModules.Avatar.Profiles |
39 | { | 39 | { |
40 | public class AvatarProfilesModule : IRegionModule | 40 | public class AvatarProfilesModule : IRegionModule |