aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
diff options
context:
space:
mode:
authorteravus2012-12-19 11:53:26 -0500
committerteravus2012-12-19 11:53:26 -0500
commitc648325d7c761beb2ebe0edff3a70fdfbc81ffdb (patch)
tree831779e20f7c21037d2bfcb4dc1985412c364e6b /OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
parent* This is a better way to do the last commit. (diff)
parentAdd the interfaces for the new Avination baked texture cache service (diff)
downloadopensim-SC_OLD-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.zip
opensim-SC_OLD-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.gz
opensim-SC_OLD-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.bz2
opensim-SC_OLD-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.xz
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index dd87671..d4dbfb9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.Linden
333 protocol = "https"; 333 protocol = "https";
334 } 334 }
335 caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); 335 caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
336 m_pollservices.Add(agentID, args); 336 m_pollservices[agentID] = args;
337 m_capsDict[agentID] = capUrl; 337 m_capsDict[agentID] = capUrl;
338 } 338 }
339 339