aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
diff options
context:
space:
mode:
authorRobert Adams2013-11-04 22:12:57 -0800
committerRobert Adams2013-11-04 22:12:57 -0800
commitc931b16c1fd50d3b955662c8cd6134d7a235c519 (patch)
tree8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
parentvarregion: add plumbing to pass region size from Scene down to the (diff)
parentIf the LSL state_entry() event definition contains any parameters, then gener... (diff)
downloadopensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 79a935d..4501dd9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.ClientStack.Linden
107 107
108 public void RegisterCaps(UUID agentID, Caps caps) 108 public void RegisterCaps(UUID agentID, Caps caps)
109 { 109 {
110 UUID capID = UUID.Random(); 110// UUID capID = UUID.Random();
111 111
112 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); 112 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
113 if (m_URL == "localhost") 113 if (m_URL == "localhost")
@@ -127,7 +127,6 @@ namespace OpenSim.Region.ClientStack.Linden
127 { 127 {
128 caps.RegisterHandler("UploadBakedTexture", m_URL); 128 caps.RegisterHandler("UploadBakedTexture", m_URL);
129 } 129 }
130
131 } 130 }
132 } 131 }
133} \ No newline at end of file 132} \ No newline at end of file