aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-03-28 20:25:31 +0000
committerMW2007-03-28 20:25:31 +0000
commit9653210db7bf0af281d9b755d48d8df207adaf1b (patch)
tree611a3f7bfc2044bf138d43e1e5c1702ecefb4c0f
parentAfter hours of searching for a bug, it works - User accounts in sandbox mode,... (diff)
downloadopensim-SC-9653210db7bf0af281d9b755d48d8df207adaf1b.zip
opensim-SC-9653210db7bf0af281d9b755d48d8df207adaf1b.tar.gz
opensim-SC-9653210db7bf0af281d9b755d48d8df207adaf1b.tar.bz2
opensim-SC-9653210db7bf0af281d9b755d48d8df207adaf1b.tar.xz
Fixed name quotes bug
-rw-r--r--OpenSim.Framework/UserProfileManager.cs4
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs5
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index d6304d0..22375bc 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.User
144 uint circode = (uint)(Util.RandomClass.Next()); 144 uint circode = (uint)(Util.RandomClass.Next());
145 //TheUser.AddSimCircuit(circode, SimInfo.UUID); 145 //TheUser.AddSimCircuit(circode, SimInfo.UUID);
146 146
147 LoginGoodData["last_name"] = "\"" + TheUser.lastname + "\""; 147 LoginGoodData["last_name"] = TheUser.lastname ;
148 LoginGoodData["ui-config"] = ui_config; 148 LoginGoodData["ui-config"] = ui_config;
149 LoginGoodData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString(); 149 LoginGoodData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();
150 LoginGoodData["login-flags"] = LoginFlags; 150 LoginGoodData["login-flags"] = LoginFlags;
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.User
162 LoginGoodData["start_location"] = "last"; 162 LoginGoodData["start_location"] = "last";
163 LoginGoodData["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + TheUser.homepos.X.ToString() + ",r" + TheUser.homepos.Y.ToString() + ",r" + TheUser.homepos.Z.ToString() + "], 'look_at':[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]}"; 163 LoginGoodData["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + TheUser.homepos.X.ToString() + ",r" + TheUser.homepos.Y.ToString() + ",r" + TheUser.homepos.Z.ToString() + "], 'look_at':[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]}";
164 LoginGoodData["message"] = DefaultStartupMsg; 164 LoginGoodData["message"] = DefaultStartupMsg;
165 LoginGoodData["first_name"] = "\"" + TheUser.firstname + "\""; 165 LoginGoodData["first_name"] = TheUser.firstname ;
166 LoginGoodData["circuit_code"] = (Int32)circode; 166 LoginGoodData["circuit_code"] = (Int32)circode;
167 LoginGoodData["sim_port"] = 9000; //(Int32)SimInfo.sim_port; 167 LoginGoodData["sim_port"] = 9000; //(Int32)SimInfo.sim_port;
168 LoginGoodData["secure_session_id"] = TheUser.CurrentSecureSessionID.ToStringHyphenated(); 168 LoginGoodData["secure_session_id"] = TheUser.CurrentSecureSessionID.ToStringHyphenated();
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index d346647..dae2191 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -89,7 +89,7 @@ namespace OpenSim
89 89
90 asset = new AssetBase(); 90 asset = new AssetBase();
91 asset.FullID = assetID; 91 asset.FullID = assetID;
92 Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated()); 92 // Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
93 asset.Type = pack.AssetBlock.Type; 93 asset.Type = pack.AssetBlock.Type;
94 asset.InvType = asset.Type; 94 asset.InvType = asset.Type;
95 asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000"); 95 asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
@@ -201,8 +201,7 @@ namespace OpenSim
201 { 201 {
202 //already complete so we can add it to the inventory 202 //already complete so we can add it to the inventory
203 m_assetCache.AddAsset(trans.Asset); 203 m_assetCache.AddAsset(trans.Asset);
204 Console.WriteLine("creating inventory item"); 204 Console.WriteLine( "Item created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated());
205 Console.WriteLine( "ITem created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated());
206 } 205 }
207 else 206 else
208 { 207 {