aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorAdam Frisby2008-11-08 17:20:54 +0000
committerAdam Frisby2008-11-08 17:20:54 +0000
commitcf0a14bec94322656f57890d49fead85ed31730e (patch)
tree861596444093bb68567cda8583cd0e94a618c120 /OpenSim/Framework
parentFix broken build since r7179 (diff)
downloadopensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.zip
opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.gz
opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.bz2
opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.xz
* Added IClientIM to IClientCore interfaces
* Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting. * Removed unused usings from Framework.*
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AssetRequestToClient.cs3
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs4
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs1
-rw-r--r--OpenSim/Framework/Client/IClientIM.cs45
-rw-r--r--OpenSim/Framework/ClientManager.cs2
-rw-r--r--OpenSim/Framework/ColliderData.cs3
-rw-r--r--OpenSim/Framework/ConfigSettings.cs4
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs2
-rw-r--r--OpenSim/Framework/EstateBan.cs3
-rw-r--r--OpenSim/Framework/EstateSettings.cs4
-rw-r--r--OpenSim/Framework/EventData.cs1
-rw-r--r--OpenSim/Framework/FriendRegionInfo.cs2
-rw-r--r--OpenSim/Framework/GroupData.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs22
-rw-r--r--OpenSim/Framework/LandStatReportItem.cs4
-rw-r--r--OpenSim/Framework/MapItemReplyStruct.cs1
-rw-r--r--OpenSim/Framework/ParcelMediaCommandEnum.cs4
-rw-r--r--OpenSim/Framework/PluginLoader.cs4
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
-rw-r--r--OpenSim/Framework/ProxyCodec.cs3
-rw-r--r--OpenSim/Framework/RegionInfo.cs3
-rw-r--r--OpenSim/Framework/RegionSettings.cs2
-rw-r--r--OpenSim/Framework/SurfaceTouchEventArgs.cs3
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs2
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs6
-rw-r--r--OpenSim/Framework/Util.cs2
26 files changed, 64 insertions, 72 deletions
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index 2bf3d3e..6e935e8 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index e1d0bbe..74a9f92 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -28,13 +28,9 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Runtime.Serialization; 31using System.Runtime.Serialization;
33using System.Security.Permissions; 32using System.Security.Permissions;
34using log4net;
35using OpenMetaverse; 33using OpenMetaverse;
36using OpenMetaverse.Packets;
37using OpenSim.Framework;
38 34
39namespace OpenSim.Framework 35namespace OpenSim.Framework
40{ 36{
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 0515aeb..260d6cf 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
new file mode 100644
index 0000000..a3498c2
--- /dev/null
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -0,0 +1,45 @@
1using System;
2using OpenMetaverse;
3
4namespace OpenSim.Framework.Client
5{
6 public class ClientInstantMessageArgs : EventArgs
7 {
8 public IClientCore client;
9 public string message;
10 public DateTime time;
11 public ClientInstantMessageSender sender;
12 }
13
14 public class ClientInstantMessageSender
15 {
16 public UUID ID;
17 public bool online;
18 public string name;
19 public Vector3 position;
20 public UUID regionID;
21 }
22
23 public delegate void ClientInstantMessage(Object sender, ClientInstantMessageArgs e);
24
25 public class ClientInstantMessageParms
26 {
27 public ClientInstantMessageSender senderInfo;
28 }
29
30 // Porting Guide from old IM
31 // SendIM(...)
32 // Loses FromAgentSession - this should be added by implementers manually.
33 //
34
35 public interface IClientIM
36 {
37 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
38 string fromName, byte dialog, uint timeStamp);
39
40 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
41 string fromName, byte dialog, uint timeStamp,
42 bool fromGroup, byte[] binaryBucket);
43 event ImprovedInstantMessage OnInstantMessage;
44 }
45}
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 3f83f5c..1bb9836 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using log4net;
31using OpenMetaverse; 32using OpenMetaverse;
32using OpenMetaverse.Packets; 33using OpenMetaverse.Packets;
33using log4net;
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework
36{ 36{
diff --git a/OpenSim/Framework/ColliderData.cs b/OpenSim/Framework/ColliderData.cs
index 4e94d6d..51ab5a8 100644
--- a/OpenSim/Framework/ColliderData.cs
+++ b/OpenSim/Framework/ColliderData.cs
@@ -26,9 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using OpenMetaverse;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 1a24711..02b8465 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework 28namespace OpenSim.Framework
33{ 29{
34 public class ConfigSettings 30 public class ConfigSettings
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 2a2b9b2..bbfe28d 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -31,8 +31,8 @@ using System.Globalization;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Xml; 33using System.Xml;
34using OpenMetaverse;
35using log4net; 34using log4net;
35using OpenMetaverse;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37 37
38namespace OpenSim.Framework 38namespace OpenSim.Framework
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index 4d31514..5c3aa42 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -26,9 +26,6 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using System;
30using System.Collections.Generic;
31using System.Text;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
34{ 31{
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index f8595e0..81f85cd 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -26,11 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Reflection;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
32using OpenMetaverse; 31using OpenMetaverse;
33using log4net;
34 32
35namespace OpenSim.Framework 33namespace OpenSim.Framework
36{ 34{
diff --git a/OpenSim/Framework/EventData.cs b/OpenSim/Framework/EventData.cs
index 70554d0..a7d3260 100644
--- a/OpenSim/Framework/EventData.cs
+++ b/OpenSim/Framework/EventData.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/FriendRegionInfo.cs b/OpenSim/Framework/FriendRegionInfo.cs
index 04e00e8..ee308ea 100644
--- a/OpenSim/Framework/FriendRegionInfo.cs
+++ b/OpenSim/Framework/FriendRegionInfo.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29
30namespace OpenSim.Framework 28namespace OpenSim.Framework
31{ 29{
32 public class FriendRegionInfo 30 public class FriendRegionInfo
diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs
index 3b980e7..8b8c6e0 100644
--- a/OpenSim/Framework/GroupData.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -26,11 +26,7 @@
26 */ 26 */
27 27
28 28
29using System;
30using System.Collections;
31using OpenMetaverse; 29using OpenMetaverse;
32using System.Collections.Generic;
33using System.Text;
34 30
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4759761..0e88dbd 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -638,7 +638,6 @@ namespace OpenSim.Framework
638 /// <summary> 638 /// <summary>
639 /// Tell this client what items it should be wearing now 639 /// Tell this client what items it should be wearing now
640 /// </summary> 640 /// </summary>
641 /// <param name="wearables"></param>
642 void SendWearables(AvatarWearable[] wearables, int serial); 641 void SendWearables(AvatarWearable[] wearables, int serial);
643 642
644 /// <summary> 643 /// <summary>
@@ -660,15 +659,18 @@ namespace OpenSim.Framework
660 659
661 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId); 660 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
662 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 661 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
663 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
664 void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
665 662
666 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 663 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
667 UUID imSessionID, string fromName, byte dialog, uint timeStamp); 664 byte audible);
668 665
669 void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 666 void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
670 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 667 byte audible);
671 bool fromGroup, byte[] binaryBucket); 668
669 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
670 uint timeStamp);
671
672 void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
673 uint timeStamp, bool fromGroup, byte[] binaryBucket);
672 674
673 void SendGenericMessage(string method, List<string> message); 675 void SendGenericMessage(string method, List<string> message);
674 676
@@ -833,7 +835,6 @@ namespace OpenSim.Framework
833 /// <summary> 835 /// <summary>
834 /// Tell the client that the requested texture cannot be found 836 /// Tell the client that the requested texture cannot be found
835 /// </summary> 837 /// </summary>
836 /// <param name="imageId"></param>
837 void SendImageNotFound(UUID imageid); 838 void SendImageNotFound(UUID imageid);
838 839
839 void SendShutdownConnectionNotice(); 840 void SendShutdownConnectionNotice();
@@ -880,7 +881,6 @@ namespace OpenSim.Framework
880 /// <summary> 881 /// <summary>
881 /// Set the debug level at which packet output should be printed to console. 882 /// Set the debug level at which packet output should be printed to console.
882 /// </summary> 883 /// </summary>
883 /// <param name="newDebugPacketLevel"></param>
884 void SetDebugPacketLevel(int newDebug); 884 void SetDebugPacketLevel(int newDebug);
885 885
886 void InPacket(object NewPack); 886 void InPacket(object NewPack);
@@ -892,7 +892,7 @@ namespace OpenSim.Framework
892 event Action<IClientAPI> OnLogout; 892 event Action<IClientAPI> OnLogout;
893 event Action<IClientAPI> OnConnectionClosed; 893 event Action<IClientAPI> OnConnectionClosed;
894 894
895 void SendBlueBoxMessage(UUID FromAvatarID, UUID fromSessionID, String FromAvatarName, String Message); 895 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
896 896
897 void SendLogoutPacket(); 897 void SendLogoutPacket();
898 ClientInfo GetClientInfo(); 898 ClientInfo GetClientInfo();
diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs
index b3ad02a..e93dda9 100644
--- a/OpenSim/Framework/LandStatReportItem.cs
+++ b/OpenSim/Framework/LandStatReportItem.cs
@@ -26,12 +26,8 @@
26 */ 26 */
27 27
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using OpenMetaverse; 29using OpenMetaverse;
33 30
34
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
37 public class LandStatReportItem 33 public class LandStatReportItem
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs
index f088085..3b3107b 100644
--- a/OpenSim/Framework/MapItemReplyStruct.cs
+++ b/OpenSim/Framework/MapItemReplyStruct.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
index 644c6ee..93c41ec 100644
--- a/OpenSim/Framework/ParcelMediaCommandEnum.cs
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Framework 28namespace OpenSim.Framework
33{ 29{
34 public enum ParcelMediaCommandEnum 30 public enum ParcelMediaCommandEnum
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index a39f787..497d9f5 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -26,14 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Xml;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
32using System.Reflection; 31using System.Reflection;
33using log4net; 32using log4net;
34using Mono.Addins; 33using Mono.Addins;
35 34
36
37namespace OpenSim.Framework 35namespace OpenSim.Framework
38{ 36{
39 /// <summary> 37 /// <summary>
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 49bc953..cd50e9e 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
35{ 35{
diff --git a/OpenSim/Framework/ProxyCodec.cs b/OpenSim/Framework/ProxyCodec.cs
index e1aeeda..df4be64 100644
--- a/OpenSim/Framework/ProxyCodec.cs
+++ b/OpenSim/Framework/ProxyCodec.cs
@@ -26,10 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Net; 29using System.Net;
31using OpenMetaverse;
32using OpenMetaverse.Packets;
33 30
34namespace OpenSim.Framework 31namespace OpenSim.Framework
35{ 32{
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 34a69d7..cac68d9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,12 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Net; 29using System.Net;
31using System.Net.Sockets; 30using System.Net.Sockets;
32using System.Xml; 31using System.Xml;
33using OpenMetaverse;
34using Nini.Config; 32using Nini.Config;
33using OpenMetaverse;
35 34
36namespace OpenSim.Framework 35namespace OpenSim.Framework
37{ 36{
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index ba04513..e1e747a 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -27,9 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
31using OpenMetaverse; 30using OpenMetaverse;
32using log4net;
33 31
34namespace OpenSim.Framework 32namespace OpenSim.Framework
35{ 33{
diff --git a/OpenSim/Framework/SurfaceTouchEventArgs.cs b/OpenSim/Framework/SurfaceTouchEventArgs.cs
index ae85197..5d4802a 100644
--- a/OpenSim/Framework/SurfaceTouchEventArgs.cs
+++ b/OpenSim/Framework/SurfaceTouchEventArgs.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 16ea042..4a1aa17 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,12 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Xml; 30using System.Xml;
32using System.Xml.Schema; 31using System.Xml.Schema;
33using System.Xml.Serialization; 32using System.Xml.Serialization;
34using OpenMetaverse; 33using OpenMetaverse;
35using log4net;
36 34
37namespace OpenSim.Framework 35namespace OpenSim.Framework
38{ 36{
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index fdb1137..1443e74 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -26,13 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Xml;
32using System.Xml.Schema;
33using System.Xml.Serialization;
34using OpenMetaverse; 29using OpenMetaverse;
35using log4net;
36 30
37namespace OpenSim.Framework 31namespace OpenSim.Framework
38{ 32{
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 122f104..7caa414 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -39,10 +39,10 @@ using System.Security.Cryptography;
39using System.Text; 39using System.Text;
40using System.Text.RegularExpressions; 40using System.Text.RegularExpressions;
41using System.Xml; 41using System.Xml;
42using OpenMetaverse;
43using log4net; 42using log4net;
44using Nini.Config; 43using Nini.Config;
45using Nwc.XmlRpc; 44using Nwc.XmlRpc;
45using OpenMetaverse;
46 46
47namespace OpenSim.Framework 47namespace OpenSim.Framework
48{ 48{