aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-20 20:04:45 +0000
committerJustin Clarke Casey2008-03-20 20:04:45 +0000
commitc1beb85315aad09197ca7ffaa8ec194346af82cb (patch)
tree2554ed107ef378a3fdab9ec23d6760a6962a92a0 /OpenSim/Framework/Util.cs
parentAdded back a fix that lbsa71 did aqes ago to fix a buffer overflow in the pac... (diff)
downloadopensim-SC_OLD-c1beb85315aad09197ca7ffaa8ec194346af82cb.zip
opensim-SC_OLD-c1beb85315aad09197ca7ffaa8ec194346af82cb.tar.gz
opensim-SC_OLD-c1beb85315aad09197ca7ffaa8ec194346af82cb.tar.bz2
opensim-SC_OLD-c1beb85315aad09197ca7ffaa8ec194346af82cb.tar.xz
* First draft resolution of mantis 777, 734, 389 - scripts do not save in non-home regions
* Should work in multi-region standalone and grid modes * This should also solve other non-home region caps issues (map requests, RC client inventory requests, etc) * We now pass CAPS information on to the destination region on region crossing, and set up a CAPS object when an agent becomes a master * Current limitation is that this will only work if your http_listener_port is 9000 * This is a very early code cut (lots of bad practice, hard coding and inefficiency). However, I wanted to get this out there for feedback and my own sanity. Next few patches will clean up the mess.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs22
1 files changed, 0 insertions, 22 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e16d15e..6c95c88 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -45,7 +45,6 @@ namespace OpenSim.Framework
45 private static Random randomClass = new Random(); 45 private static Random randomClass = new Random();
46 private static uint nextXferID = 5000; 46 private static uint nextXferID = 5000;
47 private static object XferLock = new object(); 47 private static object XferLock = new object();
48 private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>();
49 48
50 // Get a list of invalid path characters (OS dependent) 49 // Get a list of invalid path characters (OS dependent)
51 private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]"; 50 private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
@@ -422,27 +421,6 @@ namespace OpenSim.Framework
422 return "."; 421 return ".";
423 } 422 }
424 423
425 public static string GetCapsURL(LLUUID userID)
426 {
427 if (capsURLS.ContainsKey(userID))
428 {
429 return capsURLS[userID];
430 }
431 return String.Empty;
432 }
433
434 public static void SetCapsURL(LLUUID userID, string url)
435 {
436 if (capsURLS.ContainsKey(userID))
437 {
438 capsURLS[userID] = url;
439 }
440 else
441 {
442 capsURLS.Add(userID, url);
443 }
444 }
445
446 // Nini (config) related Methods 424 // Nini (config) related Methods
447 public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName) 425 public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName)
448 { 426 {