aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDiva Canto2013-07-12 12:53:58 -0700
committerDiva Canto2013-07-12 12:53:58 -0700
commit29f6ae199efd705052422b2fe9dd0e815447b0a8 (patch)
tree9c3047b5eddf63f097732ca35ace8f0dfc6bedf3 /OpenSim/Region/ClientStack
parentAdded a few more thingies to the asset client test to poke the threadpool. (diff)
downloadopensim-SC_OLD-29f6ae199efd705052422b2fe9dd0e815447b0a8.zip
opensim-SC_OLD-29f6ae199efd705052422b2fe9dd0e815447b0a8.tar.gz
opensim-SC_OLD-29f6ae199efd705052422b2fe9dd0e815447b0a8.tar.bz2
opensim-SC_OLD-29f6ae199efd705052422b2fe9dd0e815447b0a8.tar.xz
Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs35
1 files changed, 27 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 3b0ccd7..79a935d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -63,9 +63,16 @@ namespace OpenSim.Region.ClientStack.Linden
63 63
64 private Scene m_scene; 64 private Scene m_scene;
65 private bool m_persistBakedTextures; 65 private bool m_persistBakedTextures;
66 private string m_URL;
66 67
67 public void Initialise(IConfigSource source) 68 public void Initialise(IConfigSource source)
68 { 69 {
70 IConfig config = source.Configs["ClientStack.LindenCaps"];
71 if (config == null)
72 return;
73
74 m_URL = config.GetString("Cap_UploadBakedTexture", string.Empty);
75
69 IConfig appearanceConfig = source.Configs["Appearance"]; 76 IConfig appearanceConfig = source.Configs["Appearance"];
70 if (appearanceConfig != null) 77 if (appearanceConfig != null)
71 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); 78 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
@@ -100,15 +107,27 @@ namespace OpenSim.Region.ClientStack.Linden
100 107
101 public void RegisterCaps(UUID agentID, Caps caps) 108 public void RegisterCaps(UUID agentID, Caps caps)
102 { 109 {
103 caps.RegisterHandler( 110 UUID capID = UUID.Random();
104 "UploadBakedTexture", 111
105 new RestStreamHandler( 112 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
106 "POST", 113 if (m_URL == "localhost")
107 "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath, 114 {
108 new UploadBakedTextureHandler( 115 caps.RegisterHandler(
109 caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
110 "UploadBakedTexture", 116 "UploadBakedTexture",
111 agentID.ToString())); 117 new RestStreamHandler(
118 "POST",
119 "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
120 new UploadBakedTextureHandler(
121 caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
122 "UploadBakedTexture",
123 agentID.ToString()));
124
125 }
126 else
127 {
128 caps.RegisterHandler("UploadBakedTexture", m_URL);
129 }
130
112 } 131 }
113 } 132 }
114} \ No newline at end of file 133} \ No newline at end of file