ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics, rename a few vars, etc

Browse Source
This commit is contained in:
UbitUmarov
2020-03-02 01:32:33 +00:00
parent 904553cdb3
commit 97cb6254ef
7 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
View File

@@ -239,13 +239,13 @@ namespace OpenSim.Region.ClientStack.Linden
{
m_scene = scene;
// x is request id, y is userid
HasEvents = (x, y) =>
HasEvents = (requestID, agentID) =>
{
lock (responses)
{
APollResponse response;
if (responses.TryGetValue(x, out response))
if (responses.TryGetValue(requestID, out response))
{
if (m_presence == null)
m_presence = m_scene.GetScenePresence(pId);
@@ -260,37 +260,37 @@ namespace OpenSim.Region.ClientStack.Linden
}
};
Drop = (x, y) =>
Drop = (requestID, y) =>
{
lock (responses)
{
responses.Remove(x);
responses.Remove(requestID);
lock(dropedResponses)
dropedResponses.Add(x);
dropedResponses.Add(requestID);
}
};
GetEvents = (x, y) =>
GetEvents = (requestID, y) =>
{
lock (responses)
{
try
{
return responses[x].response;
return responses[requestID].response;
}
finally
{
responses.Remove(x);
responses.Remove(requestID);
}
}
};
// x is request id, y is request data hashtable
Request = (x, y) =>
Request = (requestID, request) =>
{
APollRequest reqinfo = new APollRequest();
reqinfo.thepoll = this;
reqinfo.reqID = x;
reqinfo.request = y;
reqinfo.reqID = requestID;
reqinfo.request = request;
m_queue.Add(reqinfo);
};
@@ -396,7 +396,7 @@ namespace OpenSim.Region.ClientStack.Linden
// Register this as a poll service
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
args.Type = PollServiceEventArgs.EventType.Texture;
//args.Type = PollServiceEventArgs.EventType.Texture;
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
if (handler != null)
@@ -416,7 +416,7 @@ namespace OpenSim.Region.ClientStack.Linden
string capUrl = "/CAPS/" + UUID.Random() + "/";
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
args.Type = PollServiceEventArgs.EventType.Mesh;
//args.Type = PollServiceEventArgs.EventType.Mesh;
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
if (handler != null)
@@ -434,7 +434,7 @@ namespace OpenSim.Region.ClientStack.Linden
string capUrl = "/CAPS/" + UUID.Random() + "/";
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
args.Type = PollServiceEventArgs.EventType.Mesh2;
//args.Type = PollServiceEventArgs.EventType.Mesh2;
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
if (handler != null)
@@ -453,7 +453,7 @@ namespace OpenSim.Region.ClientStack.Linden
string capUrl = "/CAPS/" + UUID.Random() + "/";
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
args.Type = PollServiceEventArgs.EventType.Asset;
//args.Type = PollServiceEventArgs.EventType.Asset;
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
if (handler != null)