diff options
| author | teravus | 2012-12-19 11:53:26 -0500 |
|---|---|---|
| committer | teravus | 2012-12-19 11:53:26 -0500 |
| commit | c648325d7c761beb2ebe0edff3a70fdfbc81ffdb (patch) | |
| tree | 831779e20f7c21037d2bfcb4dc1985412c364e6b /OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |
| parent | * This is a better way to do the last commit. (diff) | |
| parent | Add the interfaces for the new Avination baked texture cache service (diff) | |
| download | opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.zip opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.gz opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.bz2 opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.xz | |
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index 6b33561..908f628 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
| @@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 377 | protocol = "https"; | 377 | protocol = "https"; |
| 378 | } | 378 | } |
| 379 | caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | 379 | caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); |
| 380 | m_pollservices.Add(agentID, args); | 380 | m_pollservices[agentID] = args; |
| 381 | m_capsDict[agentID] = capUrl; | 381 | m_capsDict[agentID] = capUrl; |
| 382 | 382 | ||
| 383 | 383 | ||