ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Browse Source
This commit is contained in:
ubit
2012-09-26 17:18:31 +02:00
parent 24539a074e 617f1b9223
commit b07b29c247
7 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@@ -419,7 +419,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
}
public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request)
public Hashtable GetEvents(UUID requestID, UUID pAgentId)
{
if (DebugLevel >= 2)
m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);

2
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@@ -160,7 +160,7 @@ namespace OpenSim.Region.ClientStack.Linden
lock (responses)
return responses.ContainsKey(x);
};
GetEvents = (x, y, s) =>
GetEvents = (x, y) =>
{
lock (responses)
{

2
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.Linden
base(null, null, null, null, pId, int.MaxValue)
{
HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
GetEvents = (x, y, s) =>
GetEvents = (x, y) =>
{
lock (responses)
{