mirror of
https://github.com/opensim/opensim.git
synced 2026-07-20 14:45:38 +08:00
bad merge?
This commit is contained in:
UbitUmarov
@@ -78,7 +78,6 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
private Dictionary<UUID, int> m_ids = new Dictionary<UUID, int>();
|
||||
|
||||
private Dictionary<UUID, Queue<OSD>> queues = new Dictionary<UUID, Queue<OSD>>();
|
||||
private Dictionary<UUID, UUID> m_QueueUUIDAvatarMapping = new Dictionary<UUID, UUID>();
|
||||
private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
|
||||
|
||||
#region INonSharedRegionModule methods
|
||||
@@ -178,6 +177,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
<<<<<<< HEAD
|
||||
/// Always returns a valid queue
|
||||
/// </summary>
|
||||
/// <param name="agentId"></param>
|
||||
@@ -201,6 +201,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
=======
|
||||
>>>>>>> avn/ubitvar
|
||||
/// May return a null queue
|
||||
/// </summary>
|
||||
/// <param name="agentId"></param>
|
||||
@@ -263,28 +265,13 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
lock (queues)
|
||||
queues.Remove(agentID);
|
||||
|
||||
List<UUID> removeitems = new List<UUID>();
|
||||
lock (m_AvatarQueueUUIDMapping)
|
||||
m_AvatarQueueUUIDMapping.Remove(agentID);
|
||||
|
||||
UUID searchval = UUID.Zero;
|
||||
|
||||
removeitems.Clear();
|
||||
|
||||
lock (m_QueueUUIDAvatarMapping)
|
||||
lock (m_ids)
|
||||
{
|
||||
foreach (UUID ky in m_QueueUUIDAvatarMapping.Keys)
|
||||
{
|
||||
searchval = m_QueueUUIDAvatarMapping[ky];
|
||||
|
||||
if (searchval == agentID)
|
||||
{
|
||||
removeitems.Add(ky);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (UUID ky in removeitems)
|
||||
m_QueueUUIDAvatarMapping.Remove(ky);
|
||||
if (!m_ids.ContainsKey(agentID))
|
||||
m_ids.Remove(agentID);
|
||||
}
|
||||
|
||||
// m_log.DebugFormat("[EVENTQUEUE]: Deleted queues for {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
|
||||
@@ -303,61 +290,107 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
public void OnRegisterCaps(UUID agentID, Caps caps)
|
||||
{
|
||||
// Register an event queue for the client
|
||||
<<<<<<< HEAD
|
||||
|
||||
if (DebugLevel > 0)
|
||||
m_log.DebugFormat(
|
||||
"[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
|
||||
agentID, caps, m_scene.RegionInfo.RegionName);
|
||||
|
||||
// Let's instantiate a Queue for this agent right now
|
||||
TryGetQueue(agentID);
|
||||
=======
|
||||
m_log.DebugFormat(
|
||||
"[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
|
||||
agentID, caps, m_scene.RegionInfo.RegionName);
|
||||
>>>>>>> avn/ubitvar
|
||||
|
||||
UUID eventQueueGetUUID;
|
||||
Queue<OSD> queue;
|
||||
Random rnd = new Random(Environment.TickCount);
|
||||
int nrnd = rnd.Next(30000000);
|
||||
if (nrnd < 0)
|
||||
nrnd = -nrnd;
|
||||
|
||||
lock (m_AvatarQueueUUIDMapping)
|
||||
lock (queues)
|
||||
{
|
||||
// Reuse open queues. The client does!
|
||||
if (m_AvatarQueueUUIDMapping.ContainsKey(agentID))
|
||||
if (queues.ContainsKey(agentID))
|
||||
queue = queues[agentID];
|
||||
else
|
||||
queue = null;
|
||||
|
||||
if (queue == null)
|
||||
{
|
||||
//m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID!");
|
||||
eventQueueGetUUID = m_AvatarQueueUUIDMapping[agentID];
|
||||
queue = new Queue<OSD>();
|
||||
queues[agentID] = queue;
|
||||
|
||||
// push markers to handle old responses still waiting
|
||||
// this will cost at most viewer getting two forced noevents
|
||||
// even being a new queue better be safe
|
||||
queue.Enqueue(null);
|
||||
queue.Enqueue(null); // one should be enough
|
||||
|
||||
lock (m_AvatarQueueUUIDMapping)
|
||||
{
|
||||
eventQueueGetUUID = UUID.Random();
|
||||
if (m_AvatarQueueUUIDMapping.ContainsKey(agentID))
|
||||
{
|
||||
// oops this should not happen ?
|
||||
m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID without a queue");
|
||||
eventQueueGetUUID = m_AvatarQueueUUIDMapping[agentID];
|
||||
}
|
||||
m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
|
||||
}
|
||||
lock (m_ids)
|
||||
{
|
||||
if (!m_ids.ContainsKey(agentID))
|
||||
m_ids.Add(agentID, nrnd);
|
||||
else
|
||||
m_ids[agentID] = nrnd;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
eventQueueGetUUID = UUID.Random();
|
||||
//m_log.DebugFormat("[EVENTQUEUE]: Using random UUID!");
|
||||
// push markers to handle old responses still waiting
|
||||
// this will cost at most viewer getting two forced noevents
|
||||
// even being a new queue better be safe
|
||||
queue.Enqueue(null);
|
||||
queue.Enqueue(null); // one should be enough
|
||||
|
||||
// reuse or not to reuse TODO FIX
|
||||
lock (m_AvatarQueueUUIDMapping)
|
||||
{
|
||||
// Reuse open queues. The client does!
|
||||
// Its reuse caps path not queues those are been reused already
|
||||
if (m_AvatarQueueUUIDMapping.ContainsKey(agentID))
|
||||
{
|
||||
m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID!");
|
||||
eventQueueGetUUID = m_AvatarQueueUUIDMapping[agentID];
|
||||
}
|
||||
else
|
||||
{
|
||||
eventQueueGetUUID = UUID.Random();
|
||||
m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
|
||||
m_log.DebugFormat("[EVENTQUEUE]: Using random UUID!");
|
||||
}
|
||||
}
|
||||
lock (m_ids)
|
||||
{
|
||||
// change to negative numbers so they are changed at end of sending first marker
|
||||
// old data on a queue may be sent on a response for a new caps
|
||||
// but at least will be sent with coerent IDs
|
||||
if (!m_ids.ContainsKey(agentID))
|
||||
m_ids.Add(agentID, -nrnd); // should not happen
|
||||
else
|
||||
m_ids[agentID] = -m_ids[agentID];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
lock (m_QueueUUIDAvatarMapping)
|
||||
{
|
||||
if (!m_QueueUUIDAvatarMapping.ContainsKey(eventQueueGetUUID))
|
||||
m_QueueUUIDAvatarMapping.Add(eventQueueGetUUID, agentID);
|
||||
}
|
||||
|
||||
lock (m_AvatarQueueUUIDMapping)
|
||||
{
|
||||
if (!m_AvatarQueueUUIDMapping.ContainsKey(agentID))
|
||||
m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
|
||||
}
|
||||
|
||||
caps.RegisterPollHandler(
|
||||
"EventQueueGet",
|
||||
new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, SERVER_EQ_TIME_NO_EVENTS));
|
||||
|
||||
Random rnd = new Random(Environment.TickCount);
|
||||
lock (m_ids)
|
||||
{
|
||||
if (!m_ids.ContainsKey(agentID))
|
||||
m_ids.Add(agentID, rnd.Next(30000000));
|
||||
}
|
||||
}
|
||||
|
||||
public bool HasEvents(UUID requestID, UUID agentID)
|
||||
{
|
||||
// Don't use this, because of race conditions at agent closing time
|
||||
//Queue<OSD> queue = TryGetQueue(agentID);
|
||||
|
||||
Queue<OSD> queue = GetQueue(agentID);
|
||||
if (queue != null)
|
||||
lock (queue)
|
||||
@@ -366,7 +399,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
return queue.Count > 0;
|
||||
}
|
||||
|
||||
return false;
|
||||
//m_log.WarnFormat("POLLED FOR EVENTS BY {0} unknown agent", agentID);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -395,55 +429,65 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
return NoEvents(requestID, pAgentId);
|
||||
}
|
||||
|
||||
OSD element;
|
||||
OSD element = null;;
|
||||
OSDArray array = new OSDArray();
|
||||
int thisID = 0;
|
||||
bool negativeID = false;
|
||||
|
||||
lock (queue)
|
||||
{
|
||||
if (queue.Count == 0)
|
||||
return NoEvents(requestID, pAgentId);
|
||||
element = queue.Dequeue(); // 15s timeout
|
||||
}
|
||||
|
||||
int thisID = 0;
|
||||
lock (m_ids)
|
||||
thisID = m_ids[pAgentId];
|
||||
lock (m_ids)
|
||||
thisID = m_ids[pAgentId];
|
||||
|
||||
OSDArray array = new OSDArray();
|
||||
if (element == null) // didn't have an event in 15s
|
||||
{
|
||||
// Send it a fake event to keep the client polling! It doesn't like 502s like the proxys say!
|
||||
array.Add(EventQueueHelper.KeepAliveEvent());
|
||||
//m_log.DebugFormat("[EVENTQUEUE]: adding fake event for {0} in region {1}", pAgentId, m_scene.RegionInfo.RegionName);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (DebugLevel > 0)
|
||||
LogOutboundDebugMessage(element, pAgentId);
|
||||
|
||||
array.Add(element);
|
||||
|
||||
lock (queue)
|
||||
if (thisID < 0)
|
||||
{
|
||||
while (queue.Count > 0)
|
||||
{
|
||||
element = queue.Dequeue();
|
||||
|
||||
if (DebugLevel > 0)
|
||||
LogOutboundDebugMessage(element, pAgentId);
|
||||
|
||||
array.Add(element);
|
||||
thisID++;
|
||||
}
|
||||
negativeID = true;
|
||||
thisID = -thisID;
|
||||
}
|
||||
|
||||
while (queue.Count > 0)
|
||||
{
|
||||
element = queue.Dequeue();
|
||||
// add elements until a marker is found
|
||||
// so they get into a response
|
||||
if (element == null)
|
||||
break;
|
||||
if (DebugLevel > 0)
|
||||
LogOutboundDebugMessage(element, pAgentId);
|
||||
array.Add(element);
|
||||
thisID++;
|
||||
}
|
||||
}
|
||||
|
||||
OSDMap events = new OSDMap();
|
||||
events.Add("events", array);
|
||||
OSDMap events = null;
|
||||
|
||||
if (array.Count > 0)
|
||||
{
|
||||
events = new OSDMap();
|
||||
events.Add("events", array);
|
||||
events.Add("id", new OSDInteger(thisID));
|
||||
}
|
||||
|
||||
if (negativeID && element == null)
|
||||
{
|
||||
Random rnd = new Random(Environment.TickCount);
|
||||
thisID = rnd.Next(30000000);
|
||||
if (thisID < 0)
|
||||
thisID = -thisID;
|
||||
}
|
||||
|
||||
events.Add("id", new OSDInteger(thisID));
|
||||
lock (m_ids)
|
||||
{
|
||||
m_ids[pAgentId] = thisID + 1;
|
||||
}
|
||||
|
||||
// if there where no elements before a marker send a NoEvents
|
||||
if (array.Count == 0)
|
||||
return NoEvents(requestID, pAgentId);
|
||||
|
||||
Hashtable responsedata = new Hashtable();
|
||||
responsedata["int_response_code"] = 200;
|
||||
responsedata["content_type"] = "application/xml";
|
||||
@@ -461,260 +505,12 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
responsedata["content_type"] = "text/plain";
|
||||
responsedata["keepalive"] = false;
|
||||
responsedata["reusecontext"] = false;
|
||||
responsedata["str_response_string"] = "Upstream error: ";
|
||||
responsedata["error_status_text"] = "Upstream error:";
|
||||
responsedata["str_response_string"] = "<llsd></llsd>";
|
||||
responsedata["error_status_text"] = "<llsd></llsd>";
|
||||
responsedata["http_protocol_version"] = "HTTP/1.0";
|
||||
return responsedata;
|
||||
}
|
||||
|
||||
// public Hashtable ProcessQueue(Hashtable request, UUID agentID, Caps caps)
|
||||
// {
|
||||
// // TODO: this has to be redone to not busy-wait (and block the thread),
|
||||
// // TODO: as soon as we have a non-blocking way to handle HTTP-requests.
|
||||
//
|
||||
//// if (m_log.IsDebugEnabled)
|
||||
//// {
|
||||
//// String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ ";
|
||||
//// foreach (object key in request.Keys)
|
||||
//// {
|
||||
//// debug += key.ToString() + "=" + request[key].ToString() + " ";
|
||||
//// }
|
||||
//// m_log.DebugFormat(debug + " ]", agentID, m_scene.RegionInfo.RegionName, System.Threading.Thread.CurrentThread.Name);
|
||||
//// }
|
||||
//
|
||||
// Queue<OSD> queue = TryGetQueue(agentID);
|
||||
// OSD element;
|
||||
//
|
||||
// lock (queue)
|
||||
// element = queue.Dequeue(); // 15s timeout
|
||||
//
|
||||
// Hashtable responsedata = new Hashtable();
|
||||
//
|
||||
// int thisID = 0;
|
||||
// lock (m_ids)
|
||||
// thisID = m_ids[agentID];
|
||||
//
|
||||
// if (element == null)
|
||||
// {
|
||||
// //m_log.ErrorFormat("[EVENTQUEUE]: Nothing to process in " + m_scene.RegionInfo.RegionName);
|
||||
// if (thisID == -1) // close-request
|
||||
// {
|
||||
// m_log.ErrorFormat("[EVENTQUEUE]: 404 in " + m_scene.RegionInfo.RegionName);
|
||||
// responsedata["int_response_code"] = 404; //501; //410; //404;
|
||||
// responsedata["content_type"] = "text/plain";
|
||||
// responsedata["keepalive"] = false;
|
||||
// responsedata["str_response_string"] = "Closed EQG";
|
||||
// return responsedata;
|
||||
// }
|
||||
// responsedata["int_response_code"] = 502;
|
||||
// responsedata["content_type"] = "text/plain";
|
||||
// responsedata["keepalive"] = false;
|
||||
// responsedata["str_response_string"] = "Upstream error: ";
|
||||
// responsedata["error_status_text"] = "Upstream error:";
|
||||
// responsedata["http_protocol_version"] = "HTTP/1.0";
|
||||
// return responsedata;
|
||||
// }
|
||||
//
|
||||
// OSDArray array = new OSDArray();
|
||||
// if (element == null) // didn't have an event in 15s
|
||||
// {
|
||||
// // Send it a fake event to keep the client polling! It doesn't like 502s like the proxys say!
|
||||
// array.Add(EventQueueHelper.KeepAliveEvent());
|
||||
// //m_log.DebugFormat("[EVENTQUEUE]: adding fake event for {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// array.Add(element);
|
||||
//
|
||||
// if (element is OSDMap)
|
||||
// {
|
||||
// OSDMap ev = (OSDMap)element;
|
||||
// m_log.DebugFormat(
|
||||
// "[EVENT QUEUE GET MODULE]: Eq OUT {0} to {1}",
|
||||
// ev["message"], m_scene.GetScenePresence(agentID).Name);
|
||||
// }
|
||||
//
|
||||
// lock (queue)
|
||||
// {
|
||||
// while (queue.Count > 0)
|
||||
// {
|
||||
// element = queue.Dequeue();
|
||||
//
|
||||
// if (element is OSDMap)
|
||||
// {
|
||||
// OSDMap ev = (OSDMap)element;
|
||||
// m_log.DebugFormat(
|
||||
// "[EVENT QUEUE GET MODULE]: Eq OUT {0} to {1}",
|
||||
// ev["message"], m_scene.GetScenePresence(agentID).Name);
|
||||
// }
|
||||
//
|
||||
// array.Add(element);
|
||||
// thisID++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// OSDMap events = new OSDMap();
|
||||
// events.Add("events", array);
|
||||
//
|
||||
// events.Add("id", new OSDInteger(thisID));
|
||||
// lock (m_ids)
|
||||
// {
|
||||
// m_ids[agentID] = thisID + 1;
|
||||
// }
|
||||
//
|
||||
// responsedata["int_response_code"] = 200;
|
||||
// responsedata["content_type"] = "application/xml";
|
||||
// responsedata["keepalive"] = false;
|
||||
// responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events);
|
||||
//
|
||||
// m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
|
||||
//
|
||||
// return responsedata;
|
||||
// }
|
||||
|
||||
// public Hashtable EventQueuePath2(Hashtable request)
|
||||
// {
|
||||
// string capuuid = (string)request["uri"]; //path.Replace("/CAPS/EQG/","");
|
||||
// // pull off the last "/" in the path.
|
||||
// Hashtable responsedata = new Hashtable();
|
||||
// capuuid = capuuid.Substring(0, capuuid.Length - 1);
|
||||
// capuuid = capuuid.Replace("/CAPS/EQG/", "");
|
||||
// UUID AvatarID = UUID.Zero;
|
||||
// UUID capUUID = UUID.Zero;
|
||||
//
|
||||
// // parse the path and search for the avatar with it registered
|
||||
// if (UUID.TryParse(capuuid, out capUUID))
|
||||
// {
|
||||
// lock (m_QueueUUIDAvatarMapping)
|
||||
// {
|
||||
// if (m_QueueUUIDAvatarMapping.ContainsKey(capUUID))
|
||||
// {
|
||||
// AvatarID = m_QueueUUIDAvatarMapping[capUUID];
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (AvatarID != UUID.Zero)
|
||||
// {
|
||||
// return ProcessQueue(request, AvatarID, m_scene.CapsModule.GetCapsForUser(AvatarID));
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// responsedata["int_response_code"] = 404;
|
||||
// responsedata["content_type"] = "text/plain";
|
||||
// responsedata["keepalive"] = false;
|
||||
// responsedata["str_response_string"] = "Not Found";
|
||||
// responsedata["error_status_text"] = "Not Found";
|
||||
// responsedata["http_protocol_version"] = "HTTP/1.0";
|
||||
// return responsedata;
|
||||
// // return 404
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// responsedata["int_response_code"] = 404;
|
||||
// responsedata["content_type"] = "text/plain";
|
||||
// responsedata["keepalive"] = false;
|
||||
// responsedata["str_response_string"] = "Not Found";
|
||||
// responsedata["error_status_text"] = "Not Found";
|
||||
// responsedata["http_protocol_version"] = "HTTP/1.0";
|
||||
// return responsedata;
|
||||
// // return 404
|
||||
// }
|
||||
// }
|
||||
|
||||
public OSD EventQueueFallBack(string path, OSD request, string endpoint)
|
||||
{
|
||||
// This is a fallback element to keep the client from loosing EventQueueGet
|
||||
// Why does CAPS fail sometimes!?
|
||||
m_log.Warn("[EVENTQUEUE]: In the Fallback handler! We lost the Queue in the rest handler!");
|
||||
string capuuid = path.Replace("/CAPS/EQG/","");
|
||||
capuuid = capuuid.Substring(0, capuuid.Length - 1);
|
||||
|
||||
// UUID AvatarID = UUID.Zero;
|
||||
UUID capUUID = UUID.Zero;
|
||||
if (UUID.TryParse(capuuid, out capUUID))
|
||||
{
|
||||
/* Don't remove this yet code cleaners!
|
||||
* Still testing this!
|
||||
*
|
||||
lock (m_QueueUUIDAvatarMapping)
|
||||
{
|
||||
if (m_QueueUUIDAvatarMapping.ContainsKey(capUUID))
|
||||
{
|
||||
AvatarID = m_QueueUUIDAvatarMapping[capUUID];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (AvatarID != UUID.Zero)
|
||||
{
|
||||
// Repair the CAP!
|
||||
//OpenSim.Framework.Capabilities.Caps caps = m_scene.GetCapsHandlerForUser(AvatarID);
|
||||
//string capsBase = "/CAPS/EQG/";
|
||||
//caps.RegisterHandler("EventQueueGet",
|
||||
//new RestHTTPHandler("POST", capsBase + capUUID.ToString() + "/",
|
||||
//delegate(Hashtable m_dhttpMethod)
|
||||
//{
|
||||
// return ProcessQueue(m_dhttpMethod, AvatarID, caps);
|
||||
//}));
|
||||
// start new ID sequence.
|
||||
Random rnd = new Random(System.Environment.TickCount);
|
||||
lock (m_ids)
|
||||
{
|
||||
if (!m_ids.ContainsKey(AvatarID))
|
||||
m_ids.Add(AvatarID, rnd.Next(30000000));
|
||||
}
|
||||
|
||||
|
||||
int thisID = 0;
|
||||
lock (m_ids)
|
||||
thisID = m_ids[AvatarID];
|
||||
|
||||
BlockingLLSDQueue queue = GetQueue(AvatarID);
|
||||
OSDArray array = new OSDArray();
|
||||
LLSD element = queue.Dequeue(15000); // 15s timeout
|
||||
if (element == null)
|
||||
{
|
||||
|
||||
array.Add(EventQueueHelper.KeepAliveEvent());
|
||||
}
|
||||
else
|
||||
{
|
||||
array.Add(element);
|
||||
while (queue.Count() > 0)
|
||||
{
|
||||
array.Add(queue.Dequeue(1));
|
||||
thisID++;
|
||||
}
|
||||
}
|
||||
OSDMap events = new OSDMap();
|
||||
events.Add("events", array);
|
||||
|
||||
events.Add("id", new LLSDInteger(thisID));
|
||||
|
||||
lock (m_ids)
|
||||
{
|
||||
m_ids[AvatarID] = thisID + 1;
|
||||
}
|
||||
|
||||
return events;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new LLSD();
|
||||
}
|
||||
*
|
||||
*/
|
||||
}
|
||||
else
|
||||
{
|
||||
//return new LLSD();
|
||||
}
|
||||
|
||||
return new OSDString("shutdown404!");
|
||||
}
|
||||
|
||||
|
||||
public void DisableSimulator(ulong handle, UUID avatarID)
|
||||
{
|
||||
OSD item = EventQueueHelper.DisableSimulator(handle);
|
||||
@@ -723,9 +519,14 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
|
||||
public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if (DebugLevel > 0)
|
||||
m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}",
|
||||
LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY);
|
||||
=======
|
||||
m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>",
|
||||
LogHeader, handle, avatarID, regionSizeX, regionSizeY);
|
||||
>>>>>>> avn/ubitvar
|
||||
|
||||
OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
|
||||
Enqueue(item, avatarID);
|
||||
@@ -734,10 +535,15 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
|
||||
ulong regionHandle, int regionSizeX, int regionSizeY)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if (DebugLevel > 0)
|
||||
m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}",
|
||||
LogHeader, regionHandle, endPoint, avatarID, regionSizeX, regionSizeY);
|
||||
|
||||
=======
|
||||
m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>",
|
||||
LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
|
||||
>>>>>>> avn/ubitvar
|
||||
OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
|
||||
Enqueue(item, avatarID);
|
||||
}
|
||||
@@ -747,9 +553,14 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
uint locationID, uint flags, string capsURL,
|
||||
UUID avatarID, int regionSizeX, int regionSizeY)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if (DebugLevel > 0)
|
||||
m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, endPoint={2}, avatarID={3}",
|
||||
LogHeader, regionHandle, regionExternalEndPoint, avatarID, regionSizeX, regionSizeY);
|
||||
=======
|
||||
m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize={3},{4}>",
|
||||
LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
|
||||
>>>>>>> avn/ubitvar
|
||||
|
||||
OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
|
||||
locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
|
||||
@@ -760,9 +571,14 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
IPEndPoint newRegionExternalEndPoint,
|
||||
string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if (DebugLevel > 0)
|
||||
m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
|
||||
LogHeader, handle, avatarID, regionSizeX, regionSizeY);
|
||||
=======
|
||||
m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
|
||||
LogHeader, handle, avatarID, regionSizeX, regionSizeY);
|
||||
>>>>>>> avn/ubitvar
|
||||
|
||||
OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
|
||||
capsURL, avatarID, sessionID, regionSizeX, regionSizeY);
|
||||
@@ -827,4 +643,4 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
Enqueue(item, avatarID);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user