aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs6
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 4d03fee..f5ebab7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Communications.Cache
232 for (int i = 0; i < source.Configs.Count; i++) 232 for (int i = 0; i < source.Configs.Count; i++)
233 { 233 {
234 // System.Console.WriteLine("loading asset into database"); 234 // System.Console.WriteLine("loading asset into database");
235 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()); 235 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
236 string name = source.Configs[i].GetString("name", ""); 236 string name = source.Configs[i].GetString("name", "");
237 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 237 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
238 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); 238 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index 51b80e5..57c1fa6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.Communications.Cache
355 LLUUID inventoryItemID = this.inventoryItemID; 355 LLUUID inventoryItemID = this.inventoryItemID;
356 string text = ""; 356 string text = "";
357 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 357 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
358 complete.new_asset = newAssetID.ToStringHyphenated(); 358 complete.new_asset = newAssetID.ToString();
359 complete.new_inventory_item = inventoryItemID; 359 complete.new_inventory_item = inventoryItemID;
360 complete.state = "complete"; 360 complete.state = "complete";
361 text = LLSDHelpers.SerialiseLLSDReply(complete); 361 text = LLSDHelpers.SerialiseLLSDReply(complete);
@@ -408,7 +408,7 @@ namespace OpenSim.Framework.Communications.Cache
408 LLUUID inventoryItemID = this.inventoryItemID; 408 LLUUID inventoryItemID = this.inventoryItemID;
409 string text = ""; 409 string text = "";
410 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 410 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
411 complete.new_asset = newAssetID.ToStringHyphenated(); 411 complete.new_asset = newAssetID.ToString();
412 complete.new_inventory_item = inventoryItemID; 412 complete.new_inventory_item = inventoryItemID;
413 complete.state = "complete"; 413 complete.state = "complete";
414 text = LLSDHelpers.SerialiseLLSDReply(complete); 414 text = LLSDHelpers.SerialiseLLSDReply(complete);
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index fdb2afe..ffc94bf 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -144,8 +144,8 @@ namespace OpenSim.Framework.Communications.Cache
144 item.avatarID = libOwner; 144 item.avatarID = libOwner;
145 item.creatorsID = libOwner; 145 item.creatorsID = libOwner;
146 item.inventoryID = 146 item.inventoryID =
147 new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToStringHyphenated())); 147 new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToString()));
148 item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated())); 148 item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToString()));
149 item.inventoryDescription = source.Configs[i].GetString("description", ""); 149 item.inventoryDescription = source.Configs[i].GetString("description", "");
150 item.inventoryName = source.Configs[i].GetString("name", ""); 150 item.inventoryName = source.Configs[i].GetString("name", "");
151 item.assetType = source.Configs[i].GetInt("assetType", 0); 151 item.assetType = source.Configs[i].GetInt("assetType", 0);
@@ -167,4 +167,4 @@ namespace OpenSim.Framework.Communications.Cache
167 } 167 }
168 } 168 }
169 } 169 }
170} \ No newline at end of file 170}