diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index b9396b7..79a3458 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -82,24 +82,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
82 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = | 82 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = |
83 | new OpenMetaverse.BlockingQueue<aPollRequest>(); | 83 | new OpenMetaverse.BlockingQueue<aPollRequest>(); |
84 | 84 | ||
85 | <<<<<<< HEAD | 85 | |
86 | // TODO: Change this to a config option | 86 | // TODO: Change this to a config option |
87 | private string m_RedirectURL = null; | 87 | private string m_RedirectURL = null; |
88 | ======= | ||
89 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); | ||
90 | >>>>>>> avn/ubitvar | ||
91 | 88 | ||
92 | private string m_URL; | 89 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); |
90 | |||
93 | 91 | ||
94 | #region ISharedRegionModule Members | 92 | #region ISharedRegionModule Members |
95 | 93 | ||
96 | public void Initialise(IConfigSource source) | 94 | public void Initialise(IConfigSource source) |
97 | { | 95 | { |
98 | IConfig config = source.Configs["ClientStack.LindenCaps"]; | 96 | IConfig config = source.Configs["ClientStack.LindenCaps"]; |
99 | <<<<<<< HEAD | 97 | |
100 | if (config == null) | 98 | if (config == null) |
101 | return; | 99 | return; |
102 | 100 | /* | |
103 | m_URL = config.GetString("Cap_GetTexture", string.Empty); | 101 | m_URL = config.GetString("Cap_GetTexture", string.Empty); |
104 | // Cap doesn't exist | 102 | // Cap doesn't exist |
105 | if (m_URL != string.Empty) | 103 | if (m_URL != string.Empty) |
@@ -107,10 +105,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
107 | m_Enabled = true; | 105 | m_Enabled = true; |
108 | m_RedirectURL = config.GetString("GetTextureRedirectURL"); | 106 | m_RedirectURL = config.GetString("GetTextureRedirectURL"); |
109 | } | 107 | } |
110 | ======= | 108 | */ |
111 | if (config != null) | 109 | m_Url = config.GetString("Cap_GetTexture", "localhost"); |
112 | m_Url = config.GetString("Cap_GetTexture", "localhost"); | ||
113 | >>>>>>> avn/ubitvar | ||
114 | } | 110 | } |
115 | 111 | ||
116 | public void AddRegion(Scene s) | 112 | public void AddRegion(Scene s) |
@@ -142,7 +138,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
142 | 138 | ||
143 | for (uint i = 0; i < 2; i++) | 139 | for (uint i = 0; i < 2; i++) |
144 | { | 140 | { |
145 | m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests, | 141 | m_workerThreads[i] = WorkManager.StartThread(DoTextureRequests, |
146 | String.Format("TextureWorkerThread{0}", i), | 142 | String.Format("TextureWorkerThread{0}", i), |
147 | ThreadPriority.Normal, | 143 | ThreadPriority.Normal, |
148 | false, | 144 | false, |
@@ -237,12 +233,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
237 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : | 233 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : |
238 | base(null, "", null, null, null, pId, int.MaxValue) | 234 | base(null, "", null, null, null, pId, int.MaxValue) |
239 | { | 235 | { |
240 | <<<<<<< HEAD | ||
241 | // m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | ||
242 | caps.RegisterHandler( | ||
243 | "GetTexture", | ||
244 | new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString(), m_RedirectURL)); | ||
245 | ======= | ||
246 | m_scene = scene; | 236 | m_scene = scene; |
247 | // x is request id, y is userid | 237 | // x is request id, y is userid |
248 | HasEvents = (x, y) => | 238 | HasEvents = (x, y) => |
@@ -312,7 +302,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
312 | 302 | ||
313 | return response; | 303 | return response; |
314 | }; | 304 | }; |
315 | >>>>>>> avn/ubitvar | ||
316 | } | 305 | } |
317 | 306 | ||
318 | public void Process(aPollRequest requestinfo) | 307 | public void Process(aPollRequest requestinfo) |
@@ -402,11 +391,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
402 | } | 391 | } |
403 | IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>(); | 392 | IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>(); |
404 | if (handler != null) | 393 | if (handler != null) |
405 | <<<<<<< HEAD | ||
406 | handler.RegisterExternalUserCapsHandler(agentID,caps,"GetTexture", m_URL); | ||
407 | ======= | ||
408 | handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl); | 394 | handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl); |
409 | >>>>>>> avn/ubitvar | ||
410 | else | 395 | else |
411 | caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); | 396 | caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); |
412 | m_pollservices[agentID] = args; | 397 | m_pollservices[agentID] = args; |
@@ -422,7 +407,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
422 | { | 407 | { |
423 | PollServiceTextureEventArgs args; | 408 | PollServiceTextureEventArgs args; |
424 | 409 | ||
425 | MainServer.Instance.RemoveHTTPHandler("", m_URL); | 410 | MainServer.Instance.RemoveHTTPHandler("", m_Url); |
426 | m_capsDict.Remove(agentID); | 411 | m_capsDict.Remove(agentID); |
427 | 412 | ||
428 | if (m_pollservices.TryGetValue(agentID, out args)) | 413 | if (m_pollservices.TryGetValue(agentID, out args)) |