aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Grid
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs12
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs12
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs14
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs8
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs12
7 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index aa34e38..c4e8e64 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Grid.AssetServer
206 206
207 for (int i = 0; i < source.Configs.Count; i++) 207 for (int i = 0; i < source.Configs.Count; i++)
208 { 208 {
209 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()); 209 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
210 string name = source.Configs[i].GetString("name", ""); 210 string name = source.Configs[i].GetString("name", "");
211 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 211 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
212 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); 212 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 8544742..09cbe7f 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Grid.GridServer
234 { 234 {
235 TheSim = getRegion(new LLUUID((string) requestData["UUID"])); 235 TheSim = getRegion(new LLUUID((string) requestData["UUID"]));
236 236
237// logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); 237// logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
238 } 238 }
239 else if (requestData.ContainsKey("region_handle")) 239 else if (requestData.ContainsKey("region_handle"))
240 { 240 {
@@ -316,7 +316,7 @@ namespace OpenSim.Grid.GridServer
316 catch (Exception e) 316 catch (Exception e)
317 { 317 {
318 MainLog.Instance.Warn("storage", 318 MainLog.Instance.Warn("storage",
319 "Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); 319 "Unable to add region " + TheSim.UUID.ToString() + " via " + kvp.Key);
320 MainLog.Instance.Warn("storage", e.ToString()); 320 MainLog.Instance.Warn("storage", e.ToString());
321 } 321 }
322 322
@@ -502,7 +502,7 @@ namespace OpenSim.Grid.GridServer
502 simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString(); 502 simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString();
503 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); 503 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();
504 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); 504 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();
505 simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); 505 simProfileBlock["uuid"] = aSim.Value.UUID.ToString();
506 simProfileBlock["remoting_port"] = aSim.Value.remotingPort; 506 simProfileBlock["remoting_port"] = aSim.Value.remotingPort;
507 507
508 simProfileList.Add(simProfileBlock); 508 simProfileList.Add(simProfileBlock);
@@ -529,14 +529,14 @@ namespace OpenSim.Grid.GridServer
529 simProfileBlock["region-flags"] = 0; 529 simProfileBlock["region-flags"] = 0;
530 simProfileBlock["water-height"] = 20; 530 simProfileBlock["water-height"] = 20;
531 simProfileBlock["agents"] = 1; 531 simProfileBlock["agents"] = 1;
532 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToStringHyphenated(); 532 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
533 533
534 // For Sugilite compatibility 534 // For Sugilite compatibility
535 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString(); 535 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();
536 simProfileBlock["sim_ip"] = simProfile.serverIP.ToString(); 536 simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();
537 simProfileBlock["sim_port"] = simProfile.serverPort.ToString(); 537 simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
538 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString(); 538 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
539 simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated(); 539 simProfileBlock["uuid"] = simProfile.UUID.ToString();
540 540
541 simProfileList.Add(simProfileBlock); 541 simProfileList.Add(simProfileBlock);
542 } 542 }
@@ -721,7 +721,7 @@ namespace OpenSim.Grid.GridServer
721 { 721 {
722 kvp.Value.AddProfile(TheSim); 722 kvp.Value.AddProfile(TheSim);
723 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); 723 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
724 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, 724 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5,
725 "Region successfully updated and connected to grid."); 725 "Region successfully updated and connected to grid.");
726 } 726 }
727 else 727 else
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 150a262..04d4131 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.InventoryServer
108 { 108 {
109 LLUUID userID = new LLUUID(rawUserID); 109 LLUUID userID = new LLUUID(rawUserID);
110 110
111 MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToStringHyphenated()); 111 MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToString());
112 112
113 InventoryCollection invCollection = new InventoryCollection(); 113 InventoryCollection invCollection = new InventoryCollection();
114 List<InventoryFolderBase> folders; 114 List<InventoryFolderBase> folders;
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.InventoryServer
127 LLUUID userID = new LLUUID(rawUserID); 127 LLUUID userID = new LLUUID(rawUserID);
128 128
129 MainLog.Instance.Verbose( 129 MainLog.Instance.Verbose(
130 "INVENTORY", "Creating new set of inventory folders for " + userID.ToStringHyphenated()); 130 "INVENTORY", "Creating new set of inventory folders for " + userID.ToString());
131 131
132 CreateNewUserInventory(userID); 132 CreateNewUserInventory(userID);
133 return true; 133 return true;
@@ -154,7 +154,7 @@ namespace OpenSim.Grid.InventoryServer
154 // Right now, this actions act more like an update/insert combination than a simple create. 154 // Right now, this actions act more like an update/insert combination than a simple create.
155 MainLog.Instance.Verbose( 155 MainLog.Instance.Verbose(
156 "INVENTORY", 156 "INVENTORY",
157 "Updating in " + folder.parentID.ToStringHyphenated() 157 "Updating in " + folder.parentID.ToString()
158 + ", folder " + folder.name); 158 + ", folder " + folder.name);
159 159
160 AddNewInventoryFolder(folder.agentID, folder); 160 AddNewInventoryFolder(folder.agentID, folder);
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.InventoryServer
166 MainLog.Instance.Verbose( 166 MainLog.Instance.Verbose(
167 "INVENTORY", 167 "INVENTORY",
168 "Moving folder " + folder.folderID 168 "Moving folder " + folder.folderID
169 + " to " + folder.parentID.ToStringHyphenated()); 169 + " to " + folder.parentID.ToString());
170 170
171 MoveExistingInventoryFolder(folder); 171 MoveExistingInventoryFolder(folder);
172 return true; 172 return true;
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.InventoryServer
177 // Right now, this actions act more like an update/insert combination than a simple create. 177 // Right now, this actions act more like an update/insert combination than a simple create.
178 MainLog.Instance.Verbose( 178 MainLog.Instance.Verbose(
179 "INVENTORY", 179 "INVENTORY",
180 "Updating in " + item.parentFolderID.ToStringHyphenated() 180 "Updating in " + item.parentFolderID.ToString()
181 + ", item " + item.inventoryName); 181 + ", item " + item.inventoryName);
182 182
183 AddNewInventoryItem(item.avatarID, item); 183 AddNewInventoryItem(item.avatarID, item);
@@ -189,7 +189,7 @@ namespace OpenSim.Grid.InventoryServer
189 // extra spaces to align with other inventory messages 189 // extra spaces to align with other inventory messages
190 MainLog.Instance.Verbose( 190 MainLog.Instance.Verbose(
191 "INVENTORY", 191 "INVENTORY",
192 "Deleting in " + item.parentFolderID.ToStringHyphenated() 192 "Deleting in " + item.parentFolderID.ToString()
193 + ", item " + item.inventoryName); 193 + ", item " + item.inventoryName);
194 194
195 DeleteItem(item); 195 DeleteItem(item);
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index f3a45c6..1070bcf 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -164,13 +164,13 @@ namespace OpenSim.Grid.InventoryServer
164 164
165 private byte[] GetUserInventory(LLUUID userID) 165 private byte[] GetUserInventory(LLUUID userID)
166 { 166 {
167 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToStringHyphenated()); 167 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToString());
168 byte[] result = new byte[] { }; 168 byte[] result = new byte[] { };
169 169
170 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID); 170 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID);
171 if (fb == null) 171 if (fb == null)
172 { 172 {
173 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToStringHyphenated()); 173 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToString());
174 CreateDefaultInventory(userID); 174 CreateDefaultInventory(userID);
175 } 175 }
176 176
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 64921d7..8f58b55 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -820,7 +820,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
820 820
821 public string llGetOwner() 821 public string llGetOwner()
822 { 822 {
823 return m_host.ObjectOwner.ToStringHyphenated(); 823 return m_host.ObjectOwner.ToString();
824 } 824 }
825 825
826 public void llInstantMessage(string user, string message) 826 public void llInstantMessage(string user, string message)
@@ -840,7 +840,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
840 840
841 public string llGetKey() 841 public string llGetKey()
842 { 842 {
843 return m_host.UUID.ToStringHyphenated(); 843 return m_host.UUID.ToString();
844 } 844 }
845 845
846 public void llSetBuoyancy(double buoyancy) 846 public void llSetBuoyancy(double buoyancy)
@@ -1234,7 +1234,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1234 1234
1235 public string llList2Key(List<string> src, int index) 1235 public string llList2Key(List<string> src, int index)
1236 { 1236 {
1237 //return OpenSim.Framework.ToStringHyphenated(src[index]); 1237 //return OpenSim.Framework.ToString(src[index]);
1238 return src[index].ToString(); 1238 return src[index].ToString();
1239 } 1239 }
1240 1240
@@ -1923,7 +1923,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1923 1923
1924 public string llGetCreator() 1924 public string llGetCreator()
1925 { 1925 {
1926 return m_host.ObjectCreator.ToStringHyphenated(); 1926 return m_host.ObjectCreator.ToString();
1927 } 1927 }
1928 1928
1929 public string llGetTimestamp() 1929 public string llGetTimestamp()
@@ -2265,14 +2265,14 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2265 LLUUID createdTexture = 2265 LLUUID createdTexture =
2266 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, 2266 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
2267 extraParams, timer); 2267 extraParams, timer);
2268 return createdTexture.ToStringHyphenated(); 2268 return createdTexture.ToString();
2269 } 2269 }
2270 else 2270 else
2271 { 2271 {
2272 //TODO update existing dynamic textures 2272 //TODO update existing dynamic textures
2273 } 2273 }
2274 2274
2275 return LLUUID.Zero.ToStringHyphenated(); 2275 return LLUUID.Zero.ToString();
2276 } 2276 }
2277 2277
2278 private void NotImplemented(string Command) 2278 private void NotImplemented(string Command)
@@ -2281,4 +2281,4 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2281 throw new NotImplementedException("Command not implemented: " + Command); 2281 throw new NotImplementedException("Command not implemented: " + Command);
2282 } 2282 }
2283 } 2283 }
2284} \ No newline at end of file 2284}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index c5c0d02..9b9360d 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -246,10 +246,10 @@ namespace OpenSim.Grid.UserServer
246 } 246 }
247 TempHash = new Hashtable(); 247 TempHash = new Hashtable();
248 TempHash["name"] = InvFolder.name; 248 TempHash["name"] = InvFolder.name;
249 TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated(); 249 TempHash["parent_id"] = InvFolder.parentID.ToString();
250 TempHash["version"] = (Int32)InvFolder.version; 250 TempHash["version"] = (Int32)InvFolder.version;
251 TempHash["type_default"] = (Int32)InvFolder.type; 251 TempHash["type_default"] = (Int32)InvFolder.type;
252 TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated(); 252 TempHash["folder_id"] = InvFolder.folderID.ToString();
253 AgentInventoryArray.Add(TempHash); 253 AgentInventoryArray.Add(TempHash);
254 } 254 }
255 return new InventoryData(AgentInventoryArray, rootID); 255 return new InventoryData(AgentInventoryArray, rootID);
@@ -268,10 +268,10 @@ namespace OpenSim.Grid.UserServer
268 { 268 {
269 TempHash = new Hashtable(); 269 TempHash = new Hashtable();
270 TempHash["name"] = InvFolder.FolderName; 270 TempHash["name"] = InvFolder.FolderName;
271 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 271 TempHash["parent_id"] = InvFolder.ParentID.ToString();
272 TempHash["version"] = (Int32)InvFolder.Version; 272 TempHash["version"] = (Int32)InvFolder.Version;
273 TempHash["type_default"] = (Int32)InvFolder.DefaultType; 273 TempHash["type_default"] = (Int32)InvFolder.DefaultType;
274 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); 274 TempHash["folder_id"] = InvFolder.FolderID.ToString();
275 AgentInventoryArray.Add(TempHash); 275 AgentInventoryArray.Add(TempHash);
276 } 276 }
277 277
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index a697e91..9b5af0f 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -76,12 +76,12 @@ namespace OpenSim.Grid.UserServer
76 XmlRpcResponse response = new XmlRpcResponse(); 76 XmlRpcResponse response = new XmlRpcResponse();
77 Hashtable responseData = new Hashtable(); 77 Hashtable responseData = new Hashtable();
78 // Query Result Information 78 // Query Result Information
79 responseData["queryid"] = (string)queryID.ToStringHyphenated(); 79 responseData["queryid"] = (string)queryID.ToString();
80 responseData["avcount"] = (string)returnUsers.Count.ToString(); 80 responseData["avcount"] = (string)returnUsers.Count.ToString();
81 81
82 for (int i = 0; i < returnUsers.Count; i++) 82 for (int i = 0; i < returnUsers.Count; i++)
83 { 83 {
84 responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToStringHyphenated(); 84 responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToString();
85 responseData["firstname" + i.ToString()] = returnUsers[i].firstName; 85 responseData["firstname" + i.ToString()] = returnUsers[i].firstName;
86 responseData["lastname" + i.ToString()] = returnUsers[i].lastName; 86 responseData["lastname" + i.ToString()] = returnUsers[i].lastName;
87 } 87 }
@@ -102,17 +102,17 @@ namespace OpenSim.Grid.UserServer
102 // Account information 102 // Account information
103 responseData["firstname"] = profile.username; 103 responseData["firstname"] = profile.username;
104 responseData["lastname"] = profile.surname; 104 responseData["lastname"] = profile.surname;
105 responseData["uuid"] = profile.UUID.ToStringHyphenated(); 105 responseData["uuid"] = profile.UUID.ToString();
106 // Server Information 106 // Server Information
107 responseData["server_inventory"] = profile.userInventoryURI; 107 responseData["server_inventory"] = profile.userInventoryURI;
108 responseData["server_asset"] = profile.userAssetURI; 108 responseData["server_asset"] = profile.userAssetURI;
109 // Profile Information 109 // Profile Information
110 responseData["profile_about"] = profile.profileAboutText; 110 responseData["profile_about"] = profile.profileAboutText;
111 responseData["profile_firstlife_about"] = profile.profileFirstText; 111 responseData["profile_firstlife_about"] = profile.profileFirstText;
112 responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated(); 112 responseData["profile_firstlife_image"] = profile.profileFirstImage.ToString();
113 responseData["profile_can_do"] = profile.profileCanDoMask.ToString(); 113 responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
114 responseData["profile_want_do"] = profile.profileWantDoMask.ToString(); 114 responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
115 responseData["profile_image"] = profile.profileImage.ToStringHyphenated(); 115 responseData["profile_image"] = profile.profileImage.ToString();
116 responseData["profile_created"] = profile.created.ToString(); 116 responseData["profile_created"] = profile.created.ToString();
117 responseData["profile_lastlogin"] = profile.lastLogin.ToString(); 117 responseData["profile_lastlogin"] = profile.lastLogin.ToString();
118 // Home region information 118 // Home region information
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.UserServer
137 XmlRpcResponse response = new XmlRpcResponse(); 137 XmlRpcResponse response = new XmlRpcResponse();
138 Hashtable requestData = (Hashtable)request.Params[0]; 138 Hashtable requestData = (Hashtable)request.Params[0];
139 List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); 139 List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
140 LLUUID queryID = new LLUUID(LLUUID.Zero.ToStringHyphenated()); 140 LLUUID queryID = new LLUUID(LLUUID.Zero.ToString());
141 141
142 if (requestData.Contains("avquery") && requestData.Contains("queryid")) 142 if (requestData.Contains("avquery") && requestData.Contains("queryid"))
143 { 143 {