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

cosmetics, rename a few vars, etc

master
UbitUmarov 2020-03-02 01:32:33 +00:00
parent 904553cdb3
commit 97cb6254ef
7 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public DropMethod Drop;
public UUID Id;
public int TimeOutms;
public EventType Type;
//public EventType Type;
public enum EventType : int
{
@ -87,7 +87,7 @@ namespace OpenSim.Framework.Servers.HttpServer
Drop = pDrop;
Id = pId;
TimeOutms = pTimeOutms;
Type = EventType.Poll;
//Type = EventType.Poll;
}
}
}

8
OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
View File

@ -97,23 +97,23 @@ namespace OpenSim.Region.ClientStack.LindenCaps
public void RegisterCaps(UUID agent, Caps caps)
{
UUID capId = UUID.Random();
string capPath = "/CAPS/" + UUID.Random().ToString();
caps.RegisterHandler("AgentPreferences",
new RestStreamHandler("POST", "/CAPS/" + capId,
new RestStreamHandler("POST", capPath,
delegate(string request, string path, string param,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
return UpdateAgentPreferences(request, path, param, agent);
}));
caps.RegisterHandler("UpdateAgentLanguage",
new RestStreamHandler("POST", "/CAPS/" + capId,
new RestStreamHandler("POST", capPath,
delegate(string request, string path, string param,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
return UpdateAgentPreferences(request, path, param, agent);
}));
caps.RegisterHandler("UpdateAgentInformation",
new RestStreamHandler("POST", "/CAPS/" + capId,
new RestStreamHandler("POST", capPath,
delegate(string request, string path, string param,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{

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)

1
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@ -283,7 +283,6 @@ namespace OpenSim.Region.ClientStack.Linden
Hashtable responsedata = new Hashtable();
responsedata["int_response_code"] = 200;
responsedata["content_type"] = "text/plain";
responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(copy);
return responsedata;

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

@ -257,39 +257,43 @@ namespace OpenSim.Region.ClientStack.Linden
{
m_module = module;
HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
HasEvents = (requestID, y) =>
{
lock (responses)
return responses.ContainsKey(requestID);
};
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];
return responses[requestID];
}
finally
{
responses.Remove(x);
responses.Remove(requestID);
}
}
};
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);
};
@ -377,7 +381,7 @@ namespace OpenSim.Region.ClientStack.Linden
// Register this as a poll service
PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(this, capUrl, agentID);
args.Type = PollServiceEventArgs.EventType.Inventory;
//args.Type = PollServiceEventArgs.EventType.Inventory;
caps.RegisterPollHandler(capName, args);
}

4
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
PollServiceEventArgs args
= new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, Drop, urlcode, 25000);
args.Type = PollServiceEventArgs.EventType.LslHttp;
//args.Type = PollServiceEventArgs.EventType.LslHttp;
m_HttpServer.AddPollServiceHTTPHandler(uri, args);
// m_log.DebugFormat(
@ -316,7 +316,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
PollServiceEventArgs args
= new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, Drop, urlcode, 25000);
args.Type = PollServiceEventArgs.EventType.LslHttp;
//args.Type = PollServiceEventArgs.EventType.LslHttp;
m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
// m_log.DebugFormat(

2
OpenSim/Server/Base/ServerUtils.cs
View File

@ -331,7 +331,7 @@ namespace OpenSim.Server.Base
int nterms = terms.Length;
if (nterms == 0)
return new Dictionary<string, object>();
return new Dictionary<string, object>();
Dictionary<string, object> result = new Dictionary<string, object>(nterms);
string name;