aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/LLSDStreamHandler.cs4
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs5
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Framework/Serialization/TarArchiveWriter.cs4
-rw-r--r--OpenSim/Framework/Util.cs1
-rw-r--r--OpenSim/Region/Application/OpenSim.cs84
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs31
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs35
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs22
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs16
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
-rw-r--r--OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs3
-rw-r--r--OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs3
-rw-r--r--OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs5
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs42
-rw-r--r--OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs13
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs6
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs45
-rw-r--r--OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs9
-rw-r--r--OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs9
-rw-r--r--OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs3
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
27 files changed, 169 insertions, 204 deletions
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs
index f5c728c..5df24b2 100644
--- a/OpenSim/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Capabilities/LLSDStreamHandler.cs
@@ -66,9 +66,7 @@ namespace OpenSim.Framework.Capabilities
66 66
67 TResponse response = m_method(llsdRequest); 67 TResponse response = m_method(llsdRequest);
68 68
69 Encoding encoding = new UTF8Encoding(false); 69 return Util.UTF8NoBomEncoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
70
71 return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
72 } 70 }
73 } 71 }
74} 72}
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 57fb808..ffcc584 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -99,6 +99,11 @@ namespace OpenSim.Framework
99 public string lastname; 99 public string lastname;
100 100
101 /// <summary> 101 /// <summary>
102 /// Agent's full name.
103 /// </summary>
104 public string Name { get { return string.Format("{0} {1}", firstname, lastname); } }
105
106 /// <summary>
102 /// Random Unique GUID for this session. Client gets this at login and it's 107 /// Random Unique GUID for this session. Client gets this at login and it's
103 /// only supposed to be disclosed over secure channels 108 /// only supposed to be disclosed over secure channels
104 /// </summary> 109 /// </summary>
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4b15325..58a65de 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1369,7 +1369,6 @@ namespace OpenSim.Framework
1369 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message); 1369 void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
1370 1370
1371 void SendLogoutPacket(); 1371 void SendLogoutPacket();
1372 EndPoint GetClientEP();
1373 1372
1374 // WARNING WARNING WARNING 1373 // WARNING WARNING WARNING
1375 // 1374 //
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
index 122fa8e..2a3bc48 100644
--- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
@@ -41,8 +41,6 @@ namespace OpenSim.Framework.Serialization
41 { 41 {
42// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
45
46 /// <summary> 44 /// <summary>
47 /// Binary writer for the underlying stream 45 /// Binary writer for the underlying stream
48 /// </summary> 46 /// </summary>
@@ -73,7 +71,7 @@ namespace OpenSim.Framework.Serialization
73 /// <param name="data"></param> 71 /// <param name="data"></param>
74 public void WriteFile(string filePath, string data) 72 public void WriteFile(string filePath, string data)
75 { 73 {
76 WriteFile(filePath, m_utf8Encoding.GetBytes(data)); 74 WriteFile(filePath, Util.UTF8NoBomEncoding.GetBytes(data));
77 } 75 }
78 76
79 /// <summary> 77 /// <summary>
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 30bbfd4..384f716 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -148,6 +148,7 @@ namespace OpenSim.Framework
148 } 148 }
149 149
150 public static Encoding UTF8 = Encoding.UTF8; 150 public static Encoding UTF8 = Encoding.UTF8;
151 public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false);
151 152
152 /// <value> 153 /// <value>
153 /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 154 /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards)
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1458ff9..e6b57c2 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -996,44 +996,11 @@ namespace OpenSim
996 break; 996 break;
997 997
998 case "connections": 998 case "connections":
999 System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n"); 999 HandleShowConnections();
1000 m_sceneManager.ForEachScene(
1001 delegate(Scene scene) {
1002 scene.ForEachClient(
1003 delegate(IClientAPI client) {
1004 connections.AppendFormat(
1005 "{0}: {1} ({2}) from {3} on circuit {4}\n",
1006 scene.RegionInfo.RegionName,
1007 client.Name,
1008 client.AgentId,
1009 client.RemoteEndPoint,
1010 client.CircuitCode
1011 );
1012 }
1013 );
1014 }
1015 );
1016
1017 MainConsole.Instance.Output(connections.ToString());
1018 break; 1000 break;
1019 1001
1020 case "circuits": 1002 case "circuits":
1021 System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n"); 1003 HandleShowCircuits();
1022 m_sceneManager.ForEachScene(
1023 delegate(Scene scene) {
1024 //this.HttpServer.
1025 acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName);
1026 foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.GetAgentCircuits().Values)
1027 acd.AppendFormat(
1028 "\t{0} {1} ({2})\n",
1029 aCircuit.firstname,
1030 aCircuit.lastname,
1031 (aCircuit.child ? "Child" : "Root")
1032 );
1033 }
1034 );
1035
1036 MainConsole.Instance.Output(acd.ToString());
1037 break; 1004 break;
1038 1005
1039 case "http-handlers": 1006 case "http-handlers":
@@ -1138,6 +1105,53 @@ namespace OpenSim
1138 } 1105 }
1139 } 1106 }
1140 1107
1108 private void HandleShowCircuits()
1109 {
1110 ConsoleDisplayTable cdt = new ConsoleDisplayTable();
1111 cdt.AddColumn("Region", 20);
1112 cdt.AddColumn("Avatar name", 24);
1113 cdt.AddColumn("Type", 5);
1114 cdt.AddColumn("Code", 10);
1115 cdt.AddColumn("IP", 16);
1116 cdt.AddColumn("Viewer Name", 24);
1117
1118 m_sceneManager.ForEachScene(
1119 s =>
1120 {
1121 foreach (AgentCircuitData aCircuit in s.AuthenticateHandler.GetAgentCircuits().Values)
1122 cdt.AddRow(
1123 s.Name,
1124 aCircuit.Name,
1125 aCircuit.child ? "child" : "root",
1126 aCircuit.circuitcode.ToString(),
1127 aCircuit.IPAddress.ToString(),
1128 aCircuit.Viewer);
1129 });
1130
1131 MainConsole.Instance.Output(cdt.ToString());
1132 }
1133
1134 private void HandleShowConnections()
1135 {
1136 ConsoleDisplayTable cdt = new ConsoleDisplayTable();
1137 cdt.AddColumn("Region", 20);
1138 cdt.AddColumn("Avatar name", 24);
1139 cdt.AddColumn("Circuit code", 12);
1140 cdt.AddColumn("Endpoint", 23);
1141 cdt.AddColumn("Active?", 7);
1142
1143 m_sceneManager.ForEachScene(
1144 s => s.ForEachClient(
1145 c => cdt.AddRow(
1146 s.Name,
1147 c.Name,
1148 c.RemoteEndPoint.ToString(),
1149 c.CircuitCode.ToString(),
1150 c.IsActive.ToString())));
1151
1152 MainConsole.Instance.Output(cdt.ToString());
1153 }
1154
1141 /// <summary> 1155 /// <summary>
1142 /// Use XML2 format to serialize data to a file 1156 /// Use XML2 format to serialize data to a file
1143 /// </summary> 1157 /// </summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3461971..e6289bd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
59 /// Handles new client connections 59 /// Handles new client connections
60 /// Constructor takes a single Packet and authenticates everything 60 /// Constructor takes a single Packet and authenticates everything
61 /// </summary> 61 /// </summary>
62 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IClientIPEndpoint, IStatsCollector 62 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IStatsCollector
63 { 63 {
64 /// <value> 64 /// <value>
65 /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. 65 /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details.
@@ -365,7 +365,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
365 protected string m_lastName; 365 protected string m_lastName;
366 protected Thread m_clientThread; 366 protected Thread m_clientThread;
367 protected Vector3 m_startpos; 367 protected Vector3 m_startpos;
368 protected EndPoint m_userEndPoint;
369 protected UUID m_activeGroupID; 368 protected UUID m_activeGroupID;
370 protected string m_activeGroupName = String.Empty; 369 protected string m_activeGroupName = String.Empty;
371 protected ulong m_activeGroupPowers; 370 protected ulong m_activeGroupPowers;
@@ -458,7 +457,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
458 /// <summary> 457 /// <summary>
459 /// Constructor 458 /// Constructor
460 /// </summary> 459 /// </summary>
461 public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo, 460 public LLClientView(Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo,
462 UUID agentId, UUID sessionId, uint circuitCode) 461 UUID agentId, UUID sessionId, uint circuitCode)
463 { 462 {
464// DebugPacketLevel = 1; 463// DebugPacketLevel = 1;
@@ -466,7 +465,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
466 RegisterInterface<IClientIM>(this); 465 RegisterInterface<IClientIM>(this);
467 RegisterInterface<IClientInventory>(this); 466 RegisterInterface<IClientInventory>(this);
468 RegisterInterface<IClientChat>(this); 467 RegisterInterface<IClientChat>(this);
469 RegisterInterface<IClientIPEndpoint>(this);
470 468
471 m_scene = scene; 469 m_scene = scene;
472 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); 470 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
@@ -483,7 +481,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
483 m_sessionId = sessionId; 481 m_sessionId = sessionId;
484 m_secureSessionId = sessionInfo.LoginInfo.SecureSession; 482 m_secureSessionId = sessionInfo.LoginInfo.SecureSession;
485 m_circuitCode = circuitCode; 483 m_circuitCode = circuitCode;
486 m_userEndPoint = remoteEP;
487 m_firstName = sessionInfo.LoginInfo.First; 484 m_firstName = sessionInfo.LoginInfo.First;
488 m_lastName = sessionInfo.LoginInfo.Last; 485 m_lastName = sessionInfo.LoginInfo.Last;
489 m_startpos = sessionInfo.LoginInfo.StartPos; 486 m_startpos = sessionInfo.LoginInfo.StartPos;
@@ -11982,7 +11979,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11982 { 11979 {
11983 ClientInfo info = m_udpClient.GetClientInfo(); 11980 ClientInfo info = m_udpClient.GetClientInfo();
11984 11981
11985 info.userEP = m_userEndPoint;
11986 info.proxyEP = null; 11982 info.proxyEP = null;
11987 info.agentcircuit = RequestClientInfo(); 11983 info.agentcircuit = RequestClientInfo();
11988 11984
@@ -11994,11 +11990,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11994 m_udpClient.SetClientInfo(info); 11990 m_udpClient.SetClientInfo(info);
11995 } 11991 }
11996 11992
11997 public EndPoint GetClientEP()
11998 {
11999 return m_userEndPoint;
12000 }
12001
12002 #region Media Parcel Members 11993 #region Media Parcel Members
12003 11994
12004 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) 11995 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
@@ -12272,24 +12263,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12272 return numPackets; 12263 return numPackets;
12273 } 12264 }
12274 12265
12275 #region IClientIPEndpoint Members
12276
12277 public IPAddress EndPoint
12278 {
12279 get
12280 {
12281 if (m_userEndPoint is IPEndPoint)
12282 {
12283 IPEndPoint ep = (IPEndPoint)m_userEndPoint;
12284
12285 return ep.Address;
12286 }
12287 return null;
12288 }
12289 }
12290
12291 #endregion
12292
12293 public void SendRebakeAvatarTextures(UUID textureID) 12266 public void SendRebakeAvatarTextures(UUID textureID)
12294 { 12267 {
12295 RebakeAvatarTexturesPacket pack = 12268 RebakeAvatarTexturesPacket pack =
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 754d9d2..bcb45cf 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1106,7 +1106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1106 { 1106 {
1107 LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); 1107 LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
1108 1108
1109 client = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); 1109 client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
1110 client.OnLogout += LogoutHandler; 1110 client.OnLogout += LogoutHandler;
1111 1111
1112 ((LLClientView)client).DisableFacelights = m_disableFacelights; 1112 ((LLClientView)client).DisableFacelights = m_disableFacelights;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 540f33a..3c6e381 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -41,8 +41,7 @@ using OpenMetaverse;
41 41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
43{ 43{
44 public class LocalGridServicesConnector : 44 public class LocalGridServicesConnector : ISharedRegionModule, IGridService
45 ISharedRegionModule, IGridService
46 { 45 {
47 private static readonly ILog m_log = 46 private static readonly ILog m_log =
48 LogManager.GetLogger( 47 LogManager.GetLogger(
@@ -51,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
51 private IGridService m_GridService; 50 private IGridService m_GridService;
52 private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>(); 51 private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>();
53 52
54 private bool m_Enabled = false; 53 private bool m_Enabled;
55 54
56 public LocalGridServicesConnector() 55 public LocalGridServicesConnector()
57 { 56 {
@@ -59,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
59 58
60 public LocalGridServicesConnector(IConfigSource source) 59 public LocalGridServicesConnector(IConfigSource source)
61 { 60 {
62 m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated"); 61 m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector instantiated directly.");
63 InitialiseService(source); 62 InitialiseService(source);
64 } 63 }
65 64
@@ -84,8 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
84 if (name == Name) 83 if (name == Name)
85 { 84 {
86 InitialiseService(source); 85 InitialiseService(source);
87 m_Enabled = true; 86 m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled");
88 m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled");
89 } 87 }
90 } 88 }
91 } 89 }
@@ -95,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
95 IConfig assetConfig = source.Configs["GridService"]; 93 IConfig assetConfig = source.Configs["GridService"];
96 if (assetConfig == null) 94 if (assetConfig == null)
97 { 95 {
98 m_log.Error("[LOCAL GRID CONNECTOR]: GridService missing from OpenSim.ini"); 96 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini");
99 return; 97 return;
100 } 98 }
101 99
@@ -104,7 +102,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
104 102
105 if (serviceDll == String.Empty) 103 if (serviceDll == String.Empty)
106 { 104 {
107 m_log.Error("[LOCAL GRID CONNECTOR]: No LocalServiceModule named in section GridService"); 105 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: No LocalServiceModule named in section GridService");
108 return; 106 return;
109 } 107 }
110 108
@@ -115,16 +113,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
115 113
116 if (m_GridService == null) 114 if (m_GridService == null)
117 { 115 {
118 m_log.Error("[LOCAL GRID CONNECTOR]: Can't load grid service"); 116 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: Can't load grid service");
119 return; 117 return;
120 } 118 }
119
120 m_Enabled = true;
121 } 121 }
122 122
123 public void PostInitialise() 123 public void PostInitialise()
124 { 124 {
125 // FIXME: We will still add this command even if we aren't enabled since RemoteGridServiceConnector
126 // will have instantiated us directly.
125 MainConsole.Instance.Commands.AddCommand("Regions", false, "show neighbours", 127 MainConsole.Instance.Commands.AddCommand("Regions", false, "show neighbours",
126 "show neighbours", 128 "show neighbours",
127 "Shows the local regions' neighbours", NeighboursCommand); 129 "Shows the local regions' neighbours", HandleShowNeighboursCommand);
128 } 130 }
129 131
130 public void Close() 132 public void Close()
@@ -133,17 +135,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
133 135
134 public void AddRegion(Scene scene) 136 public void AddRegion(Scene scene)
135 { 137 {
136 if (m_Enabled) 138 if (!m_Enabled)
137 scene.RegisterModuleInterface<IGridService>(this); 139 return;
140
141 scene.RegisterModuleInterface<IGridService>(this);
138 142
139 if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID)) 143 if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
140 m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); 144 m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
141 else 145 else
142 m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); 146 m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
143 } 147 }
144 148
145 public void RemoveRegion(Scene scene) 149 public void RemoveRegion(Scene scene)
146 { 150 {
151 if (!m_Enabled)
152 return;
153
147 m_LocalCache[scene.RegionInfo.RegionID].Clear(); 154 m_LocalCache[scene.RegionInfo.RegionID].Clear();
148 m_LocalCache.Remove(scene.RegionInfo.RegionID); 155 m_LocalCache.Remove(scene.RegionInfo.RegionID);
149 } 156 }
@@ -232,7 +239,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
232 239
233 #endregion 240 #endregion
234 241
235 public void NeighboursCommand(string module, string[] cmdparams) 242 public void HandleShowNeighboursCommand(string module, string[] cmdparams)
236 { 243 {
237 System.Text.StringBuilder caps = new System.Text.StringBuilder(); 244 System.Text.StringBuilder caps = new System.Text.StringBuilder();
238 245
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index 40cc536..7a90686 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -125,13 +125,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
125 uint x, y; 125 uint x, y;
126 Utils.LongToUInts(regionHandle, out x, out y); 126 Utils.LongToUInts(regionHandle, out x, out y);
127 127
128 m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from region {0} to region at {1}-{2}",
129 thisRegion.RegionName, x / Constants.RegionSize, y / Constants.RegionSize);
130
131 foreach (Scene s in m_Scenes) 128 foreach (Scene s in m_Scenes)
132 { 129 {
133 if (s.RegionInfo.RegionHandle == regionHandle) 130 if (s.RegionInfo.RegionHandle == regionHandle)
134 { 131 {
132 m_log.DebugFormat("[LOCAL NEIGHBOUR SERVICE CONNECTOR]: HelloNeighbour from region {0} to neighbour {1} at {2}-{3}",
133 thisRegion.RegionName, s.Name, x / Constants.RegionSize, y / Constants.RegionSize);
134
135 //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); 135 //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
136 return s.IncomingHelloNeighbour(thisRegion); 136 return s.IncomingHelloNeighbour(thisRegion);
137 } 137 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index eae8b8e..19f319c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -811,7 +811,7 @@ namespace OpenSim.Region.Framework.Scenes
811 } 811 }
812 } 812 }
813 813
814 string grant = startupConfig.GetString("AllowedViewerList", String.Empty); 814 string grant = startupConfig.GetString("AllowedClients", String.Empty);
815 if (grant.Length > 0) 815 if (grant.Length > 0)
816 { 816 {
817 foreach (string viewer in grant.Split(',')) 817 foreach (string viewer in grant.Split(','))
@@ -820,7 +820,7 @@ namespace OpenSim.Region.Framework.Scenes
820 } 820 }
821 } 821 }
822 822
823 grant = startupConfig.GetString("BannedViewerList", String.Empty); 823 grant = startupConfig.GetString("BannedClients", String.Empty);
824 if (grant.Length > 0) 824 if (grant.Length > 0)
825 { 825 {
826 foreach (string viewer in grant.Split(',')) 826 foreach (string viewer in grant.Split(','))
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index c1414ee..5d8447b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -84,16 +84,23 @@ namespace OpenSim.Region.Framework.Scenes
84 if (neighbourService != null) 84 if (neighbourService != null)
85 neighbour = neighbourService.HelloNeighbour(regionhandle, region); 85 neighbour = neighbourService.HelloNeighbour(regionhandle, region);
86 else 86 else
87 m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: No neighbour service provided for informing neigbhours of this region"); 87 m_log.DebugFormat(
88 "[SCENE COMMUNICATION SERVICE]: No neighbour service provided for region {0} to inform neigbhours of status",
89 m_scene.Name);
88 90
89 if (neighbour != null) 91 if (neighbour != null)
90 { 92 {
91 m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); 93 m_log.DebugFormat(
94 "[SCENE COMMUNICATION SERVICE]: Region {0} successfully informed neighbour {1} at {2}-{3} that it is up",
95 m_scene.Name, neighbour.RegionName, x / Constants.RegionSize, y / Constants.RegionSize);
96
92 m_scene.EventManager.TriggerOnRegionUp(neighbour); 97 m_scene.EventManager.TriggerOnRegionUp(neighbour);
93 } 98 }
94 else 99 else
95 { 100 {
96 m_log.InfoFormat("[SCENE COMMUNICATION SERVICE]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize); 101 m_log.WarnFormat(
102 "[SCENE COMMUNICATION SERVICE]: Region {0} failed to inform neighbour at {1}-{2} that it is up.",
103 x / Constants.RegionSize, y / Constants.RegionSize);
97 } 104 }
98 } 105 }
99 106
@@ -101,8 +108,13 @@ namespace OpenSim.Region.Framework.Scenes
101 { 108 {
102 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 109 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
103 110
104 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); 111 List<GridRegion> neighbours
105 m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that this region is up", neighbours.Count); 112 = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
113
114 m_log.DebugFormat(
115 "[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that region {1} is up",
116 neighbours.Count, m_scene.Name);
117
106 foreach (GridRegion n in neighbours) 118 foreach (GridRegion n in neighbours)
107 { 119 {
108 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; 120 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index b449089..17a210b 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
44{ 44{
45 public delegate void OnIRCClientReadyDelegate(IRCClientView cv); 45 public delegate void OnIRCClientReadyDelegate(IRCClientView cv);
46 46
47 public class IRCClientView : IClientAPI, IClientCore, IClientIPEndpoint 47 public class IRCClientView : IClientAPI, IClientCore
48 { 48 {
49 public event OnIRCClientReadyDelegate OnIRCReady; 49 public event OnIRCClientReadyDelegate OnIRCReady;
50 50
@@ -1440,11 +1440,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1440 Disconnect(); 1440 Disconnect();
1441 } 1441 }
1442 1442
1443 public EndPoint GetClientEP()
1444 {
1445 return null;
1446 }
1447
1448 public ClientInfo GetClientInfo() 1443 public ClientInfo GetClientInfo()
1449 { 1444 {
1450 return new ClientInfo(); 1445 return new ClientInfo();
@@ -1642,15 +1637,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1642 1637
1643 #endregion 1638 #endregion
1644 1639
1645 #region Implementation of IClientIPEndpoint
1646
1647 public IPAddress EndPoint
1648 {
1649 get { return ((IPEndPoint) m_client.Client.RemoteEndPoint).Address; }
1650 }
1651
1652 #endregion
1653
1654 public void SendRebakeAvatarTextures(UUID textureID) 1640 public void SendRebakeAvatarTextures(UUID textureID)
1655 { 1641 {
1656 } 1642 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 045661a..97db7e1 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -952,11 +952,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
952 { 952 {
953 } 953 }
954 954
955 public EndPoint GetClientEP()
956 {
957 return null;
958 }
959
960 public ClientInfo GetClientInfo() 955 public ClientInfo GetClientInfo()
961 { 956 {
962 return null; 957 return null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 4d20f7b..bc20f71 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -883,13 +883,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
883 if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence) 883 if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
884 { 884 {
885 ScenePresence target = (ScenePresence)World.Entities[avatarID]; 885 ScenePresence target = (ScenePresence)World.Entities[avatarID];
886 EndPoint ep = target.ControllingClient.GetClientEP(); 886 return target.ControllingClient.RemoteEndPoint.Address.ToString();
887 if (ep is IPEndPoint)
888 {
889 IPEndPoint ip = (IPEndPoint)ep;
890 return ip.Address.ToString();
891 }
892 } 887 }
888
893 // fall through case, just return nothing 889 // fall through case, just return nothing
894 return ""; 890 return "";
895 } 891 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 3ddf1d4..8d92ba5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
954 try 954 try
955 { 955 {
956 FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")); 956 FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state"));
957 Byte[] buf = (new UTF8Encoding()).GetBytes(xml); 957 Byte[] buf = Util.UTF8NoBomEncoding.GetBytes(xml);
958 fs.Write(buf, 0, buf.Length); 958 fs.Write(buf, 0, buf.Length);
959 fs.Close(); 959 fs.Close();
960 } 960 }
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index a19b599..6b93cd9 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -321,8 +321,7 @@ namespace OpenSim.Server.Handlers.Authentication
321 private byte[] ResultToBytes(Dictionary<string, object> result) 321 private byte[] ResultToBytes(Dictionary<string, object> result)
322 { 322 {
323 string xmlString = ServerUtils.BuildXmlResponse(result); 323 string xmlString = ServerUtils.BuildXmlResponse(result);
324 UTF8Encoding encoding = new UTF8Encoding(); 324 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
325 return encoding.GetBytes(xmlString);
326 } 325 }
327 } 326 }
328} 327}
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index 3ee405c..393584e 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -121,8 +121,7 @@ namespace OpenSim.Server.Handlers.Avatar
121 121
122 string xmlString = ServerUtils.BuildXmlResponse(result); 122 string xmlString = ServerUtils.BuildXmlResponse(result);
123 123
124 UTF8Encoding encoding = new UTF8Encoding(); 124 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
125 return encoding.GetBytes(xmlString);
126 } 125 }
127 126
128 return FailureResult(); 127 return FailureResult();
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
index ef9b96f..47a8558 100644
--- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
@@ -152,10 +152,9 @@ namespace OpenSim.Server.Handlers.Friends
152 } 152 }
153 153
154 string xmlString = ServerUtils.BuildXmlResponse(result); 154 string xmlString = ServerUtils.BuildXmlResponse(result);
155 //m_log.DebugFormat("[FRIENDS HANDLER]: resp string: {0}", xmlString);
156 UTF8Encoding encoding = new UTF8Encoding();
157 return encoding.GetBytes(xmlString);
158 155
156 //m_log.DebugFormat("[FRIENDS HANDLER]: resp string: {0}", xmlString);
157 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
159 } 158 }
160 159
161 byte[] StoreFriend(Dictionary<string, object> request) 160 byte[] StoreFriend(Dictionary<string, object> request)
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 91d14cb..ef5f33e 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -226,10 +226,9 @@ namespace OpenSim.Server.Handlers.Grid
226 } 226 }
227 227
228 string xmlString = ServerUtils.BuildXmlResponse(result); 228 string xmlString = ServerUtils.BuildXmlResponse(result);
229 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
230 UTF8Encoding encoding = new UTF8Encoding();
231 return encoding.GetBytes(xmlString);
232 229
230 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
231 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
233 } 232 }
234 233
235 byte[] GetRegionByUUID(Dictionary<string, object> request) 234 byte[] GetRegionByUUID(Dictionary<string, object> request)
@@ -256,9 +255,9 @@ namespace OpenSim.Server.Handlers.Grid
256 result["result"] = rinfo.ToKeyValuePairs(); 255 result["result"] = rinfo.ToKeyValuePairs();
257 256
258 string xmlString = ServerUtils.BuildXmlResponse(result); 257 string xmlString = ServerUtils.BuildXmlResponse(result);
258
259 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 259 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
260 UTF8Encoding encoding = new UTF8Encoding(); 260 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
261 return encoding.GetBytes(xmlString);
262 } 261 }
263 262
264 byte[] GetRegionByPosition(Dictionary<string, object> request) 263 byte[] GetRegionByPosition(Dictionary<string, object> request)
@@ -289,9 +288,9 @@ namespace OpenSim.Server.Handlers.Grid
289 result["result"] = rinfo.ToKeyValuePairs(); 288 result["result"] = rinfo.ToKeyValuePairs();
290 289
291 string xmlString = ServerUtils.BuildXmlResponse(result); 290 string xmlString = ServerUtils.BuildXmlResponse(result);
291
292 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 292 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
293 UTF8Encoding encoding = new UTF8Encoding(); 293 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
294 return encoding.GetBytes(xmlString);
295 } 294 }
296 295
297 byte[] GetRegionByName(Dictionary<string, object> request) 296 byte[] GetRegionByName(Dictionary<string, object> request)
@@ -318,9 +317,9 @@ namespace OpenSim.Server.Handlers.Grid
318 result["result"] = rinfo.ToKeyValuePairs(); 317 result["result"] = rinfo.ToKeyValuePairs();
319 318
320 string xmlString = ServerUtils.BuildXmlResponse(result); 319 string xmlString = ServerUtils.BuildXmlResponse(result);
320
321 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 321 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
322 UTF8Encoding encoding = new UTF8Encoding(); 322 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
323 return encoding.GetBytes(xmlString);
324 } 323 }
325 324
326 byte[] GetRegionsByName(Dictionary<string, object> request) 325 byte[] GetRegionsByName(Dictionary<string, object> request)
@@ -361,9 +360,9 @@ namespace OpenSim.Server.Handlers.Grid
361 } 360 }
362 361
363 string xmlString = ServerUtils.BuildXmlResponse(result); 362 string xmlString = ServerUtils.BuildXmlResponse(result);
363
364 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 364 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
365 UTF8Encoding encoding = new UTF8Encoding(); 365 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
366 return encoding.GetBytes(xmlString);
367 } 366 }
368 367
369 byte[] GetRegionRange(Dictionary<string, object> request) 368 byte[] GetRegionRange(Dictionary<string, object> request)
@@ -410,9 +409,9 @@ namespace OpenSim.Server.Handlers.Grid
410 } 409 }
411 } 410 }
412 string xmlString = ServerUtils.BuildXmlResponse(result); 411 string xmlString = ServerUtils.BuildXmlResponse(result);
412
413 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 413 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
414 UTF8Encoding encoding = new UTF8Encoding(); 414 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
415 return encoding.GetBytes(xmlString);
416 } 415 }
417 416
418 byte[] GetDefaultRegions(Dictionary<string, object> request) 417 byte[] GetDefaultRegions(Dictionary<string, object> request)
@@ -440,9 +439,9 @@ namespace OpenSim.Server.Handlers.Grid
440 } 439 }
441 } 440 }
442 string xmlString = ServerUtils.BuildXmlResponse(result); 441 string xmlString = ServerUtils.BuildXmlResponse(result);
442
443 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 443 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
444 UTF8Encoding encoding = new UTF8Encoding(); 444 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
445 return encoding.GetBytes(xmlString);
446 } 445 }
447 446
448 byte[] GetFallbackRegions(Dictionary<string, object> request) 447 byte[] GetFallbackRegions(Dictionary<string, object> request)
@@ -481,9 +480,9 @@ namespace OpenSim.Server.Handlers.Grid
481 } 480 }
482 } 481 }
483 string xmlString = ServerUtils.BuildXmlResponse(result); 482 string xmlString = ServerUtils.BuildXmlResponse(result);
483
484 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 484 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
485 UTF8Encoding encoding = new UTF8Encoding(); 485 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
486 return encoding.GetBytes(xmlString);
487 } 486 }
488 487
489 byte[] GetHyperlinks(Dictionary<string, object> request) 488 byte[] GetHyperlinks(Dictionary<string, object> request)
@@ -511,9 +510,9 @@ namespace OpenSim.Server.Handlers.Grid
511 } 510 }
512 } 511 }
513 string xmlString = ServerUtils.BuildXmlResponse(result); 512 string xmlString = ServerUtils.BuildXmlResponse(result);
513
514 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 514 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
515 UTF8Encoding encoding = new UTF8Encoding(); 515 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
516 return encoding.GetBytes(xmlString);
517 } 516 }
518 517
519 byte[] GetRegionFlags(Dictionary<string, object> request) 518 byte[] GetRegionFlags(Dictionary<string, object> request)
@@ -537,12 +536,11 @@ namespace OpenSim.Server.Handlers.Grid
537 result["result"] = flags.ToString(); 536 result["result"] = flags.ToString();
538 537
539 string xmlString = ServerUtils.BuildXmlResponse(result); 538 string xmlString = ServerUtils.BuildXmlResponse(result);
539
540 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 540 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
541 UTF8Encoding encoding = new UTF8Encoding(); 541 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
542 return encoding.GetBytes(xmlString);
543 } 542 }
544 543
545
546 #endregion 544 #endregion
547 545
548 #region Misc 546 #region Misc
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index bf21255..687cf8d 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -117,10 +117,9 @@ namespace OpenSim.Server.Handlers.GridUser
117 result["result"] = guinfo.ToKeyValuePairs(); 117 result["result"] = guinfo.ToKeyValuePairs();
118 118
119 string xmlString = ServerUtils.BuildXmlResponse(result); 119 string xmlString = ServerUtils.BuildXmlResponse(result);
120 //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
121 UTF8Encoding encoding = new UTF8Encoding();
122 return encoding.GetBytes(xmlString);
123 120
121 //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
122 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
124 } 123 }
125 124
126 byte[] LoggedOut(Dictionary<string, object> request) 125 byte[] LoggedOut(Dictionary<string, object> request)
@@ -189,10 +188,9 @@ namespace OpenSim.Server.Handlers.GridUser
189 result["result"] = guinfo.ToKeyValuePairs(); 188 result["result"] = guinfo.ToKeyValuePairs();
190 189
191 string xmlString = ServerUtils.BuildXmlResponse(result); 190 string xmlString = ServerUtils.BuildXmlResponse(result);
192 //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
193 UTF8Encoding encoding = new UTF8Encoding();
194 return encoding.GetBytes(xmlString);
195 191
192 //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
193 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
196 } 194 }
197 195
198 byte[] GetGridUserInfos(Dictionary<string, object> request) 196 byte[] GetGridUserInfos(Dictionary<string, object> request)
@@ -231,8 +229,7 @@ namespace OpenSim.Server.Handlers.GridUser
231 } 229 }
232 230
233 string xmlString = ServerUtils.BuildXmlResponse(result); 231 string xmlString = ServerUtils.BuildXmlResponse(result);
234 UTF8Encoding encoding = new UTF8Encoding(); 232 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
235 return encoding.GetBytes(xmlString);
236 } 233 }
237 234
238 private bool UnpackArgs(Dictionary<string, object> request, out string user, out UUID region, out Vector3 position, out Vector3 lookAt) 235 private bool UnpackArgs(Dictionary<string, object> request, out string user, out UUID region, out Vector3 position, out Vector3 lookAt)
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index c2f127c..0aa2729 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -279,13 +279,11 @@ namespace OpenSim.Server.Handlers.Hypergrid
279 } 279 }
280 280
281 string xmlString = ServerUtils.BuildXmlResponse(result); 281 string xmlString = ServerUtils.BuildXmlResponse(result);
282 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
283 UTF8Encoding encoding = new UTF8Encoding();
284 return encoding.GetBytes(xmlString);
285 282
283 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
284 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
286 } 285 }
287 286
288
289 #endregion 287 #endregion
290 288
291 #region Misc 289 #region Misc
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index cb9b65d..64127c2 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -217,9 +217,9 @@ namespace OpenSim.Server.Handlers.Asset
217 result["RESULT"] = "False"; 217 result["RESULT"] = "False";
218 218
219 string xmlString = ServerUtils.BuildXmlResponse(result); 219 string xmlString = ServerUtils.BuildXmlResponse(result);
220
220 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 221 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
221 UTF8Encoding encoding = new UTF8Encoding(); 222 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
222 return encoding.GetBytes(xmlString);
223 } 223 }
224 224
225 byte[] HandleGetInventorySkeleton(Dictionary<string,object> request) 225 byte[] HandleGetInventorySkeleton(Dictionary<string,object> request)
@@ -245,9 +245,9 @@ namespace OpenSim.Server.Handlers.Asset
245 result["FOLDERS"] = sfolders; 245 result["FOLDERS"] = sfolders;
246 246
247 string xmlString = ServerUtils.BuildXmlResponse(result); 247 string xmlString = ServerUtils.BuildXmlResponse(result);
248
248 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 249 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
249 UTF8Encoding encoding = new UTF8Encoding(); 250 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
250 return encoding.GetBytes(xmlString);
251 } 251 }
252 252
253 byte[] HandleGetUserInventory(Dictionary<string, object> request) 253 byte[] HandleGetUserInventory(Dictionary<string, object> request)
@@ -284,9 +284,9 @@ namespace OpenSim.Server.Handlers.Asset
284 } 284 }
285 285
286 string xmlString = ServerUtils.BuildXmlResponse(result); 286 string xmlString = ServerUtils.BuildXmlResponse(result);
287
287 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 288 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
288 UTF8Encoding encoding = new UTF8Encoding(); 289 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
289 return encoding.GetBytes(xmlString);
290 } 290 }
291 291
292 byte[] HandleGetRootFolder(Dictionary<string,object> request) 292 byte[] HandleGetRootFolder(Dictionary<string,object> request)
@@ -300,9 +300,9 @@ namespace OpenSim.Server.Handlers.Asset
300 result["folder"] = EncodeFolder(rfolder); 300 result["folder"] = EncodeFolder(rfolder);
301 301
302 string xmlString = ServerUtils.BuildXmlResponse(result); 302 string xmlString = ServerUtils.BuildXmlResponse(result);
303
303 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 304 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
304 UTF8Encoding encoding = new UTF8Encoding(); 305 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
305 return encoding.GetBytes(xmlString);
306 } 306 }
307 307
308 byte[] HandleGetFolderForType(Dictionary<string,object> request) 308 byte[] HandleGetFolderForType(Dictionary<string,object> request)
@@ -317,9 +317,9 @@ namespace OpenSim.Server.Handlers.Asset
317 result["folder"] = EncodeFolder(folder); 317 result["folder"] = EncodeFolder(folder);
318 318
319 string xmlString = ServerUtils.BuildXmlResponse(result); 319 string xmlString = ServerUtils.BuildXmlResponse(result);
320
320 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 321 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
321 UTF8Encoding encoding = new UTF8Encoding(); 322 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
322 return encoding.GetBytes(xmlString);
323 } 323 }
324 324
325 byte[] HandleGetFolderContent(Dictionary<string,object> request) 325 byte[] HandleGetFolderContent(Dictionary<string,object> request)
@@ -358,9 +358,9 @@ namespace OpenSim.Server.Handlers.Asset
358 } 358 }
359 359
360 string xmlString = ServerUtils.BuildXmlResponse(result); 360 string xmlString = ServerUtils.BuildXmlResponse(result);
361
361 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 362 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
362 UTF8Encoding encoding = new UTF8Encoding(); 363 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
363 return encoding.GetBytes(xmlString);
364 } 364 }
365 365
366 byte[] HandleGetFolderItems(Dictionary<string,object> request) 366 byte[] HandleGetFolderItems(Dictionary<string,object> request)
@@ -386,9 +386,9 @@ namespace OpenSim.Server.Handlers.Asset
386 result["ITEMS"] = sitems; 386 result["ITEMS"] = sitems;
387 387
388 string xmlString = ServerUtils.BuildXmlResponse(result); 388 string xmlString = ServerUtils.BuildXmlResponse(result);
389
389 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 390 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
390 UTF8Encoding encoding = new UTF8Encoding(); 391 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
391 return encoding.GetBytes(xmlString);
392 } 392 }
393 393
394 byte[] HandleAddFolder(Dictionary<string,object> request) 394 byte[] HandleAddFolder(Dictionary<string,object> request)
@@ -550,9 +550,9 @@ namespace OpenSim.Server.Handlers.Asset
550 result["item"] = EncodeItem(item); 550 result["item"] = EncodeItem(item);
551 551
552 string xmlString = ServerUtils.BuildXmlResponse(result); 552 string xmlString = ServerUtils.BuildXmlResponse(result);
553
553 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 554 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
554 UTF8Encoding encoding = new UTF8Encoding(); 555 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
555 return encoding.GetBytes(xmlString);
556 } 556 }
557 557
558 byte[] HandleGetFolder(Dictionary<string,object> request) 558 byte[] HandleGetFolder(Dictionary<string,object> request)
@@ -567,9 +567,9 @@ namespace OpenSim.Server.Handlers.Asset
567 result["folder"] = EncodeFolder(folder); 567 result["folder"] = EncodeFolder(folder);
568 568
569 string xmlString = ServerUtils.BuildXmlResponse(result); 569 string xmlString = ServerUtils.BuildXmlResponse(result);
570
570 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 571 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
571 UTF8Encoding encoding = new UTF8Encoding(); 572 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
572 return encoding.GetBytes(xmlString);
573 } 573 }
574 574
575 byte[] HandleGetActiveGestures(Dictionary<string,object> request) 575 byte[] HandleGetActiveGestures(Dictionary<string,object> request)
@@ -592,9 +592,9 @@ namespace OpenSim.Server.Handlers.Asset
592 result["ITEMS"] = items; 592 result["ITEMS"] = items;
593 593
594 string xmlString = ServerUtils.BuildXmlResponse(result); 594 string xmlString = ServerUtils.BuildXmlResponse(result);
595
595 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 596 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
596 UTF8Encoding encoding = new UTF8Encoding(); 597 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
597 return encoding.GetBytes(xmlString);
598 } 598 }
599 599
600 byte[] HandleGetAssetPermissions(Dictionary<string,object> request) 600 byte[] HandleGetAssetPermissions(Dictionary<string,object> request)
@@ -609,12 +609,11 @@ namespace OpenSim.Server.Handlers.Asset
609 609
610 result["RESULT"] = perms.ToString(); 610 result["RESULT"] = perms.ToString();
611 string xmlString = ServerUtils.BuildXmlResponse(result); 611 string xmlString = ServerUtils.BuildXmlResponse(result);
612
612 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); 613 //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
613 UTF8Encoding encoding = new UTF8Encoding(); 614 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
614 return encoding.GetBytes(xmlString);
615 } 615 }
616 616
617
618 private Dictionary<string, object> EncodeFolder(InventoryFolderBase f) 617 private Dictionary<string, object> EncodeFolder(InventoryFolderBase f)
619 { 618 {
620 Dictionary<string, object> ret = new Dictionary<string, object>(); 619 Dictionary<string, object> ret = new Dictionary<string, object>();
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 6b6a552..2d67c6d 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -199,9 +199,9 @@ namespace OpenSim.Server.Handlers.Presence
199 result["result"] = pinfo.ToKeyValuePairs(); 199 result["result"] = pinfo.ToKeyValuePairs();
200 200
201 string xmlString = ServerUtils.BuildXmlResponse(result); 201 string xmlString = ServerUtils.BuildXmlResponse(result);
202
202 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 203 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
203 UTF8Encoding encoding = new UTF8Encoding(); 204 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
204 return encoding.GetBytes(xmlString);
205 } 205 }
206 206
207 byte[] GetAgents(Dictionary<string, object> request) 207 byte[] GetAgents(Dictionary<string, object> request)
@@ -240,12 +240,11 @@ namespace OpenSim.Server.Handlers.Presence
240 } 240 }
241 241
242 string xmlString = ServerUtils.BuildXmlResponse(result); 242 string xmlString = ServerUtils.BuildXmlResponse(result);
243
243 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 244 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
244 UTF8Encoding encoding = new UTF8Encoding(); 245 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
245 return encoding.GetBytes(xmlString);
246 } 246 }
247 247
248
249 private byte[] SuccessResult() 248 private byte[] SuccessResult()
250 { 249 {
251 XmlDocument doc = new XmlDocument(); 250 XmlDocument doc = new XmlDocument();
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 3fd69ae..72551ef 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -195,9 +195,9 @@ namespace OpenSim.Server.Handlers.UserAccounts
195 } 195 }
196 196
197 string xmlString = ServerUtils.BuildXmlResponse(result); 197 string xmlString = ServerUtils.BuildXmlResponse(result);
198
198 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); 199 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
199 UTF8Encoding encoding = new UTF8Encoding(); 200 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
200 return encoding.GetBytes(xmlString);
201 } 201 }
202 202
203 byte[] StoreAccount(Dictionary<string, object> request) 203 byte[] StoreAccount(Dictionary<string, object> request)
@@ -353,8 +353,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
353 private byte[] ResultToBytes(Dictionary<string, object> result) 353 private byte[] ResultToBytes(Dictionary<string, object> result)
354 { 354 {
355 string xmlString = ServerUtils.BuildXmlResponse(result); 355 string xmlString = ServerUtils.BuildXmlResponse(result);
356 UTF8Encoding encoding = new UTF8Encoding(); 356 return Util.UTF8NoBomEncoding.GetBytes(xmlString);
357 return encoding.GetBytes(xmlString);
358 } 357 }
359 } 358 }
360} 359} \ No newline at end of file
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 888b072..7429293 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -132,8 +132,7 @@ namespace OpenSim.Services.Connectors
132 try 132 try
133 { 133 {
134 strBuffer = OSDParser.SerializeJsonString(args); 134 strBuffer = OSDParser.SerializeJsonString(args);
135 UTF8Encoding str = new UTF8Encoding(); 135 buffer = Util.UTF8NoBomEncoding.GetBytes(strBuffer);
136 buffer = str.GetBytes(strBuffer);
137 } 136 }
138 catch (Exception e) 137 catch (Exception e)
139 { 138 {
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index fb70904..e254dd8 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -971,11 +971,6 @@ namespace OpenSim.Tests.Common.Mock
971 { 971 {
972 } 972 }
973 973
974 public EndPoint GetClientEP()
975 {
976 return null;
977 }
978
979 public ClientInfo GetClientInfo() 974 public ClientInfo GetClientInfo()
980 { 975 {
981 return null; 976 return null;