ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove end slash from most URLs we send to viewers

Browse Source
This commit is contained in:
UbitUmarov
2020-05-10 21:14:52 +01:00
parent c1d69018bd
commit aafc6579a1
12 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ namespace OpenSim.Region.ClientStack.Linden
// m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
if(m_People != null)
caps.RegisterSimpleHandler("AvatarPickerSearch",
new SimpleStreamHandler("/" + UUID.Random() + "/", ProcessRequest));
new SimpleStreamHandler("/" + UUID.Random(), ProcessRequest));
}
else
{

4
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -237,7 +237,7 @@ namespace OpenSim.Region.ClientStack.Linden
public void RegisterHandlers()
{
// this path is also defined elsewhere so keeping it
string seedcapsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath + "0000/";
string seedcapsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath + "0000";
m_HostCapsObj.RegisterSimpleHandler("SEED", new SimpleStreamHandler(seedcapsBase, SeedCapRequest));
// m_log.DebugFormat(
@@ -342,7 +342,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (m_UserManager != null)
{
m_HostCapsObj.RegisterSimpleHandler("GetDisplayNames",
new SimpleStreamHandler(GetNewCapPath() +"/", GetDisplayNames));
new SimpleStreamHandler(GetNewCapPath(), GetDisplayNames));
}
}
catch (Exception e)

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

@@ -128,7 +128,7 @@ namespace OpenSim.Region.ClientStack.Linden
public void RegisterCaps(UUID agentID, Caps caps)
{
caps.RegisterSimpleHandler("EstateAccess",
new SimpleStreamHandler("/" + UUID.Random() + "/",
new SimpleStreamHandler("/" + UUID.Random(),
delegate(IOSHttpRequest request, IOSHttpResponse response)
{
ProcessRequest(request, response, agentID);

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

@@ -393,7 +393,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (m_GetTextureURL == "localhost")
{
string capUrl = "/CAPS/" + UUID.Random() + "/";
string capUrl = "/" + UUID.Random();
// Register this as a poll service
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
@@ -415,7 +415,7 @@ namespace OpenSim.Region.ClientStack.Linden
//GetMesh
if (m_GetMeshURL == "localhost")
{
string capUrl = "/CAPS/" + UUID.Random() + "/";
string capUrl = "/" + UUID.Random();
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
//args.Type = PollServiceEventArgs.EventType.Mesh;
@@ -433,7 +433,7 @@ namespace OpenSim.Region.ClientStack.Linden
//GetMesh2
if (m_GetMesh2URL == "localhost")
{
string capUrl = "/CAPS/" + UUID.Random() + "/";
string capUrl = "/" + UUID.Random();
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
//args.Type = PollServiceEventArgs.EventType.Mesh2;
@@ -452,7 +452,7 @@ namespace OpenSim.Region.ClientStack.Linden
//ViewerAsset
if (m_GetAssetURL == "localhost")
{
string capUrl = "/CAPS/" + UUID.Random() + "/";
string capUrl = "/" + UUID.Random();
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
//args.Type = PollServiceEventArgs.EventType.Asset;

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

@@ -216,7 +216,7 @@ namespace OpenSim.Region.ClientStack.Linden
public void RegisterCaps(UUID agentID, Caps caps)
{
caps.RegisterSimpleHandler("SimulatorFeatures",
new SimpleStreamHandler("/" + UUID.Random() + "/",
new SimpleStreamHandler("/" + UUID.Random(),
delegate (IOSHttpRequest request, IOSHttpResponse response)
{
HandleSimulatorFeaturesRequest(request, response, agentID);
@@ -225,7 +225,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (m_doScriptSyntax && m_scriptSyntaxID != UUID.Zero && m_scriptSyntaxXML != null)
{
caps.RegisterSimpleHandler("LSLSyntax",
new SimpleStreamHandler("/" + UUID.Random() + "/", HandleSyntaxRequest));
new SimpleStreamHandler("/" + UUID.Random(), HandleSyntaxRequest));
}
}

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

@@ -380,7 +380,7 @@ namespace OpenSim.Region.ClientStack.Linden
// handled by the simulator
else if (url == "localhost")
{
capUrl = "/CAPS/" + UUID.Random() + "/";
capUrl = "/" + UUID.Random();
// Register this as a poll service
PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(this, capUrl, agentID);