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

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2012-12-18 09:48:12 +00:00
parent caea7601cb 861477d85e
commit 79bdf464d3
28 changed files with 1445 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden
protocol = "https";
}
caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
m_pollservices.Add(agentID, args);
m_pollservices[agentID] = args;
m_capsDict[agentID] = capUrl;

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

@@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.Linden
protocol = "https";
}
caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
m_pollservices.Add(agentID, args);
m_pollservices[agentID] = args;
m_capsDict[agentID] = capUrl;
}