diff options
Temporary fix for the region crossing crash, Although we need to start to change and improve how we handle caps.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r-- | OpenSim/Framework/General/Util.cs | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs index f3a8c73..5eae206 100644 --- a/OpenSim/Framework/General/Util.cs +++ b/OpenSim/Framework/General/Util.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.IO; | 30 | using System.IO; |
30 | using System.Security.Cryptography; | 31 | using System.Security.Cryptography; |
31 | using System.Net; | 32 | using System.Net; |
@@ -41,6 +42,7 @@ namespace OpenSim.Framework.Utilities | |||
41 | private static Random randomClass = new Random(); | 42 | private static Random randomClass = new Random(); |
42 | private static uint nextXferID = 5000; | 43 | private static uint nextXferID = 5000; |
43 | private static object XferLock = new object(); | 44 | private static object XferLock = new object(); |
45 | private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>(); | ||
44 | 46 | ||
45 | public static ulong UIntsToLong(uint X, uint Y) | 47 | public static ulong UIntsToLong(uint X, uint Y) |
46 | { | 48 | { |
@@ -66,6 +68,11 @@ namespace OpenSim.Framework.Utilities | |||
66 | return id; | 68 | return id; |
67 | } | 69 | } |
68 | 70 | ||
71 | public Util() | ||
72 | { | ||
73 | |||
74 | } | ||
75 | |||
69 | public static string GetFileName(string file) | 76 | public static string GetFileName(string file) |
70 | { | 77 | { |
71 | // Return just the filename on UNIX platforms | 78 | // Return just the filename on UNIX platforms |
@@ -311,9 +318,25 @@ namespace OpenSim.Framework.Utilities | |||
311 | return temp; | 318 | return temp; |
312 | } | 319 | } |
313 | 320 | ||
314 | public Util() | 321 | public static string GetCapsURL(LLUUID userID) |
315 | { | 322 | { |
323 | if (capsURLS.ContainsKey(userID)) | ||
324 | { | ||
325 | return capsURLS[userID]; | ||
326 | } | ||
327 | return ""; | ||
328 | } | ||
316 | 329 | ||
330 | public static void SetCapsURL(LLUUID userID, string url) | ||
331 | { | ||
332 | if (capsURLS.ContainsKey(userID)) | ||
333 | { | ||
334 | capsURLS[userID] = url; | ||
335 | } | ||
336 | else | ||
337 | { | ||
338 | capsURLS.Add(userID, url); | ||
339 | } | ||
317 | } | 340 | } |
318 | 341 | ||
319 | // Nini (config) related Methods | 342 | // Nini (config) related Methods |