OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2011-01-18 01:28:50 +00:00
parent 2126d12ab8 ac16a49ca0
commit 6306578fcf
21 changed files with 107 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3493,9 +3493,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ani.AnimationList[i].AnimSequenceID = seqs[i]; ani.AnimationList[i].AnimSequenceID = seqs[i];
ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock(); ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock();
ani.AnimationSourceList[i].ObjectID = objectIDs[i]; if (objectIDs[i].Equals(sourceAgentId))
if (objectIDs[i] == UUID.Zero) ani.AnimationSourceList[i].ObjectID = UUID.Zero;
ani.AnimationSourceList[i].ObjectID = sourceAgentId; else
ani.AnimationSourceList[i].ObjectID = objectIDs[i];
} }
ani.Header.Reliable = false; ani.Header.Reliable = false;
OutPacket(ani, ThrottleOutPacketType.Task); OutPacket(ani, ThrottleOutPacketType.Task);

8
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -585,8 +585,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Stats tracking // Stats tracking
Interlocked.Increment(ref udpClient.PacketsSent); Interlocked.Increment(ref udpClient.PacketsSent);
if (isReliable)
Interlocked.Add(ref udpClient.UnackedBytes, outgoingPacket.Buffer.DataLength);
// Put the UDP payload on the wire // Put the UDP payload on the wire
AsyncBeginSend(buffer); AsyncBeginSend(buffer);
@ -859,9 +857,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Acknowledge the UseCircuitCode packet // Acknowledge the UseCircuitCode packet
SendAckImmediate(remoteEndPoint, packet.Header.Sequence); SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
m_log.DebugFormat( // m_log.DebugFormat(
"[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", // "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds); // buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
} }
private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)

47
OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
View File

@ -28,6 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Threading;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.ClientStack.LindenUDP namespace OpenSim.Region.ClientStack.LindenUDP
@ -77,6 +78,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void Add(OutgoingPacket packet) public void Add(OutgoingPacket packet)
{ {
m_pendingAdds.Enqueue(packet); m_pendingAdds.Enqueue(packet);
Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength);
} }
/// <summary> /// <summary>
@ -139,46 +141,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void ProcessQueues() private void ProcessQueues()
{ {
// Process all the pending adds // Process all the pending adds
OutgoingPacket pendingAdd; OutgoingPacket pendingAdd;
if (m_pendingAdds != null) while (m_pendingAdds.TryDequeue(out pendingAdd))
{ m_packets[pendingAdd.SequenceNumber] = pendingAdd;
while (m_pendingAdds.TryDequeue(out pendingAdd))
{
if (pendingAdd != null && m_packets != null)
{
m_packets[pendingAdd.SequenceNumber] = pendingAdd;
}
}
}
// Process all the pending removes, including updating statistics and round-trip times // Process all the pending removes, including updating statistics and round-trip times
PendingAck pendingRemove; PendingAck pendingRemove;
OutgoingPacket ackedPacket; OutgoingPacket ackedPacket;
if (m_pendingRemoves != null) while (m_pendingRemoves.TryDequeue(out pendingRemove))
{ {
while (m_pendingRemoves.TryDequeue(out pendingRemove)) if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
{ {
if (m_pendingRemoves != null && m_packets != null) m_packets.Remove(pendingRemove.SequenceNumber);
// Update stats
Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
if (!pendingRemove.FromResend)
{ {
if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) // Calculate the round-trip time for this packet and its ACK
{ int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
m_packets.Remove(pendingRemove.SequenceNumber); if (rtt > 0)
ackedPacket.Client.UpdateRoundTrip(rtt);
// Update stats
System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
if (!pendingRemove.FromResend)
{
// Calculate the round-trip time for this packet and its ACK
int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
if (rtt > 0)
ackedPacket.Client.UpdateRoundTrip(rtt);
}
}
} }
} }
} }
} }
} }
} }

2
OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
View File

@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
{ {
UUID capID = UUID.Random(); UUID capID = UUID.Random();
m_log.Info("[GETMESH]: /CAPS/" + capID); // m_log.Info("[GETMESH]: /CAPS/" + capID);
caps.RegisterHandler("GetMesh", caps.RegisterHandler("GetMesh",
new RestHTTPHandler("GET", "/CAPS/" + capID, new RestHTTPHandler("GET", "/CAPS/" + capID,
delegate(Hashtable m_dhttpMethod) delegate(Hashtable m_dhttpMethod)

4
OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
View File

@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
{ {
UUID capID = UUID.Random(); UUID capID = UUID.Random();
m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); // m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
} }
@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
/// <returns>False for "caller try another codec"; true otherwise</returns> /// <returns>False for "caller try another codec"; true otherwise</returns>
private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format) private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)
{ {
m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
AssetBase texture; AssetBase texture;
string fullID = textureID.ToString(); string fullID = textureID.ToString();

2
OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
{ {
UUID capuuid = UUID.Random(); UUID capuuid = UUID.Random();
m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/"); // m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
caps.RegisterHandler("ObjectAdd", caps.RegisterHandler("ObjectAdd",
new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/", new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/",

12
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -641,7 +641,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
lock (m_openRequests) lock (m_openRequests)
m_openRequests.Add(requestID, mrs); m_openRequests.Add(requestID, mrs);
WebRequest mapitemsrequest = WebRequest.Create(httpserver); WebRequest mapitemsrequest = null;
try
{
mapitemsrequest = WebRequest.Create(httpserver);
}
catch (Exception e)
{
m_log.DebugFormat("[WORLD MAP]: Access to {0} failed with {1}", httpserver, e);
return new OSDMap();
}
mapitemsrequest.Method = "POST"; mapitemsrequest.Method = "POST";
mapitemsrequest.ContentType = "application/xml+llsd"; mapitemsrequest.ContentType = "application/xml+llsd";
OSDMap RAMap = new OSDMap(); OSDMap RAMap = new OSDMap();

16
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1054,10 +1054,6 @@ namespace OpenSim.Region.Framework.Scenes
//else //else
// m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid);
// On the next prim update, all objects will be sent
//
m_sceneViewer.Reset();
m_isChildAgent = false; m_isChildAgent = false;
// send the animations of the other presences to me // send the animations of the other presences to me
@ -1241,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void CompleteMovement(IClientAPI client) public void CompleteMovement(IClientAPI client)
{ {
DateTime startTime = DateTime.Now; // DateTime startTime = DateTime.Now;
m_log.DebugFormat( m_log.DebugFormat(
"[SCENE PRESENCE]: Completing movement of {0} into region {1}", "[SCENE PRESENCE]: Completing movement of {0} into region {1}",
@ -1294,9 +1290,9 @@ namespace OpenSim.Region.Framework.Scenes
friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
} }
m_log.DebugFormat( // m_log.DebugFormat(
"[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
} }
/// <summary> /// <summary>
@ -3311,10 +3307,6 @@ namespace OpenSim.Region.Framework.Scenes
if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); ControllingClient.SetChildAgentThrottle(cAgentData.Throttles);
// Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
if (m_scene.m_seeIntoRegionFromNeighbor)
m_sceneViewer.Reset();
//cAgentData.AVHeight; //cAgentData.AVHeight;
m_rootRegionHandle = cAgentData.RegionHandle; m_rootRegionHandle = cAgentData.RegionHandle;
//m_velocity = cAgentData.Velocity; //m_velocity = cAgentData.Velocity;

17
OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
View File

@ -215,13 +215,22 @@ namespace OpenSim.Server.Handlers.Hypergrid
// We're behind a proxy // We're behind a proxy
Hashtable headers = (Hashtable)request["headers"]; Hashtable headers = (Hashtable)request["headers"];
if (headers.ContainsKey("X-Forwarded-For") && headers["X-Forwarded-For"] != null) string xff = "X-Forwarded-For";
if (headers.ContainsKey(xff.ToLower()))
xff = xff.ToLower();
if (!headers.ContainsKey(xff) || headers[xff] == null)
{ {
IPEndPoint ep = Util.GetClientIPFromXFF((string)headers["X-Forwarded-For"]); m_log.WarnFormat("[AGENT HANDLER]: No XFF header");
if (ep != null) return Util.GetCallerIP(request);
return ep.Address.ToString();
} }
m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]);
IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]);
if (ep != null)
return ep.Address.ToString();
// Oops // Oops
return Util.GetCallerIP(request); return Util.GetCallerIP(request);
} }

17
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -205,13 +205,22 @@ namespace OpenSim.Server.Handlers.Simulation
// We're behind a proxy // We're behind a proxy
Hashtable headers = (Hashtable)request["headers"]; Hashtable headers = (Hashtable)request["headers"];
if (headers.ContainsKey("X-Forwarded-For") && headers["X-Forwarded-For"] != null) string xff = "X-Forwarded-For";
if (headers.ContainsKey(xff.ToLower()))
xff = xff.ToLower();
if (!headers.ContainsKey(xff) || headers[xff] == null)
{ {
IPEndPoint ep = Util.GetClientIPFromXFF((string)headers["X-Forwarded-For"]); m_log.WarnFormat("[AGENT HANDLER]: No XFF header");
if (ep != null) return Util.GetCallerIP(request);
return ep.Address.ToString();
} }
m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]);
IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]);
if (ep != null)
return ep.Address.ToString();
// Oops // Oops
return Util.GetCallerIP(request); return Util.GetCallerIP(request);
} }

6
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty; private string m_ServerURI = String.Empty;
private bool m_Enabled = false; // private bool m_Enabled = false;
public SimianGridServiceConnector() { } public SimianGridServiceConnector() { }
public SimianGridServiceConnector(string serverURI) public SimianGridServiceConnector(string serverURI)
@ -95,7 +95,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/'; serviceUrl = serviceUrl + '/';
m_ServerURI = serviceUrl; m_ServerURI = serviceUrl;
m_Enabled = true; // m_Enabled = true;
} }
#region IGridService #region IGridService
@ -186,7 +186,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
} }
} }
m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); // m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID);
return regions; return regions;
} }

4
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
View File

@ -757,7 +757,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
} }
} }
m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invFolders.Count + " folders from SimianGrid response"); // m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invFolders.Count + " folders from SimianGrid response");
return invFolders; return invFolders;
} }
@ -824,7 +824,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
} }
} }
m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invItems.Count + " items from SimianGrid response"); // m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invItems.Count + " items from SimianGrid response");
return invItems; return invItems;
} }

27
OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
View File

@ -158,7 +158,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool LogoutAgent(UUID sessionID) public bool LogoutAgent(UUID sessionID)
{ {
m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool LogoutRegionAgents(UUID regionID) public bool LogoutRegionAgents(UUID regionID)
{ {
m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -202,7 +202,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public PresenceInfo GetAgent(UUID sessionID) public PresenceInfo GetAgent(UUID sessionID)
{ {
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -262,7 +262,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt) public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
{ {
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID);
// Remove the session to mark this user offline // Remove the session to mark this user offline
if (!LogoutAgent(sessionID)) if (!LogoutAgent(sessionID))
@ -287,7 +287,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt) public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
{ {
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -312,10 +312,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
public GridUserInfo GetGridUserInfo(string user) public GridUserInfo GetGridUserInfo(string user)
{ {
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
UUID userID = new UUID(user); UUID userID = new UUID(user);
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -338,7 +338,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
private OSDMap GetUserData(UUID userID) private OSDMap GetUserData(UUID userID)
{ {
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -362,7 +362,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
OSDMap userResponse = GetUserData(userID); OSDMap userResponse = GetUserData(userID);
if (userResponse != null) if (userResponse != null)
{ {
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID); // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -377,10 +377,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (presence != null) if (presence != null)
presences.Add(presence); presences.Add(presence);
} }
else // else
{ // {
m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString()); // m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString());
} // }
} }
return presences; return presences;
@ -424,7 +424,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
if (userResponse != null && userResponse["User"] is OSDMap) if (userResponse != null && userResponse["User"] is OSDMap)
{ {
GridUserInfo info = new GridUserInfo(); GridUserInfo info = new GridUserInfo();
info.Online = true; info.Online = true;

8
OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
View File

@ -157,7 +157,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
List<UserAccount> accounts = new List<UserAccount>(); List<UserAccount> accounts = new List<UserAccount>();
m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public bool StoreUserAccount(UserAccount data) public bool StoreUserAccount(UserAccount data)
{ {
m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); // m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name);
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
{ {
@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
private UserAccount GetUser(NameValueCollection requestArgs) private UserAccount GetUser(NameValueCollection requestArgs)
{ {
string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)";
m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue);
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
@ -330,4 +330,4 @@ namespace OpenSim.Services.Connectors.SimianGrid
} }
} }
} }
} }

6
OpenSim/Services/Connectors/Simulation/EstateDataService.cs
View File

@ -43,9 +43,9 @@ namespace OpenSim.Services.Connectors
{ {
public class EstateDataService : ServiceBase, IEstateDataService public class EstateDataService : ServiceBase, IEstateDataService
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
protected IEstateDataStore m_database; protected IEstateDataStore m_database;

6
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
View File

@ -43,9 +43,9 @@ namespace OpenSim.Services.Connectors
{ {
public class SimulationDataService : ServiceBase, ISimulationDataService public class SimulationDataService : ServiceBase, ISimulationDataService
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
protected ISimulationDataStore m_database; protected ISimulationDataStore m_database;

6
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -237,7 +237,7 @@ namespace OpenSim.Services.Connectors.Simulation
try try
{ {
OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000); WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000);
} }
catch (Exception e) catch (Exception e)
{ {
@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.Simulation
try try
{ {
OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000); WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000);
} }
catch (Exception e) catch (Exception e)
{ {
@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.Simulation
args["destination_name"] = OSD.FromString(destination.RegionName); args["destination_name"] = OSD.FromString(destination.RegionName);
args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
OSDMap result = WebUtil.PostToService(uri,args); WebUtil.PostToService(uri, args);
} }
catch (Exception e) catch (Exception e)
{ {

2
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -303,7 +303,7 @@ namespace OpenSim.Services.HypergridService
return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
else else
{ {
Object[] args = new Object[] { userURL }; // Object[] args = new Object[] { userURL };
IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
if (userAgentService != null) if (userAgentService != null)
{ {

7
OpenSim/Services/HypergridService/UserAccountCache.cs
View File

@ -13,9 +13,10 @@ namespace OpenSim.Services.HypergridService
{ {
private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
private ExpiringCache<UUID, UserAccount> m_UUIDCache; private ExpiringCache<UUID, UserAccount> m_UUIDCache;
private IUserAccountService m_UserAccountService; private IUserAccountService m_UserAccountService;

2
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -667,7 +667,7 @@ namespace OpenSim.Services.LLLoginService
protected virtual ArrayList GetInventoryLibrary(ILibraryService library) protected virtual ArrayList GetInventoryLibrary(ILibraryService library)
{ {
Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders(); Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders();
m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count); // m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count);
//Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>(); //Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>();
ArrayList folderHashes = new ArrayList(); ArrayList folderHashes = new ArrayList();

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -289,7 +289,7 @@ namespace OpenSim.Services.LLLoginService
// Get active gestures // Get active gestures
List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID);
m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count); // m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count);
// //
// Login the presence // Login the presence