aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 18:50:44 +0000
committerAdam Frisby2008-05-01 18:50:44 +0000
commit76d8eaa4069d6445c47784168e274ba4253f7b9c (patch)
tree6f0f023b9c994253f3f6808edf94949c7ebd2d29
parentAttempt to locate SL client in LaunchSLClient under other Unices. (diff)
downloadopensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.zip
opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.gz
opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.bz2
opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.xz
* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs16
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs3
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs15
-rw-r--r--OpenSim/TestSuite/BotManager.cs2
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs2
-rw-r--r--ThirdParty/3Di/LoadBalancer/TcpClient.cs32
13 files changed, 10 insertions, 76 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 3330732..cf81bee 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Data.MSSQL
417 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 417 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
418 { 418 {
419 SHA512Managed HashProvider = new SHA512Managed(); 419 SHA512Managed HashProvider = new SHA512Managed();
420 ASCIIEncoding TextProvider = new ASCIIEncoding(); 420 Encoding TextProvider = new UTF8Encoding();
421 421
422 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); 422 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
423 byte[] hash = HashProvider.ComputeHash(stream); 423 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index df52ae0..e830133 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
366 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 366 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
367 { 367 {
368 SHA512Managed HashProvider = new SHA512Managed(); 368 SHA512Managed HashProvider = new SHA512Managed();
369 ASCIIEncoding TextProvider = new ASCIIEncoding(); 369 Encoding TextProvider = new UTF8Encoding();
370 370
371 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); 371 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
372 byte[] hash = HashProvider.ComputeHash(stream); 372 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index f07b98f..989ec77 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Data.SQLite
224 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 224 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
225 { 225 {
226 SHA512Managed HashProvider = new SHA512Managed(); 226 SHA512Managed HashProvider = new SHA512Managed();
227 ASCIIEncoding TextProvider = new ASCIIEncoding(); 227 Encoding TextProvider = new UTF8Encoding();
228 228
229 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); 229 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
230 byte[] hash = HashProvider.ComputeHash(stream); 230 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 9908735..b648ee8 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1223,22 +1223,6 @@ namespace OpenSim.Data.SQLite
1223 s.TextureEntry = textureEntry; 1223 s.TextureEntry = textureEntry;
1224 1224
1225 s.ExtraParams = (byte[]) row["ExtraParams"]; 1225 s.ExtraParams = (byte[]) row["ExtraParams"];
1226 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
1227 // string texture = encoding.GetString((Byte[])row["Texture"]);
1228 // if (!texture.StartsWith("<"))
1229 // {
1230 // //here so that we can still work with old format database files (ie from before I added xml serialization)
1231 // LLObject.TextureEntry textureEntry = null;
1232 // textureEntry = new LLObject.TextureEntry(new LLUUID(texture));
1233 // s.TextureEntry = textureEntry.ToBytes();
1234 // }
1235 // else
1236 // {
1237 // TextureBlock textureEntry = TextureBlock.FromXmlString(texture);
1238 // s.TextureEntry = textureEntry.TextureData;
1239 // s.ExtraParams = textureEntry.ExtraParams;
1240 // }
1241
1242 return s; 1226 return s;
1243 } 1227 }
1244 1228
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 088d944..e198c2c 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Framework.Servers
201 } 201 }
202 } 202 }
203 } 203 }
204 catch (SocketException e) 204 catch (SocketException)
205 { 205 {
206 // At least on linux, it appears that if the client makes a request without requiring the response, 206 // At least on linux, it appears that if the client makes a request without requiring the response,
207 // an unconnected socket exception is thrown when we close the response output stream. There's no 207 // an unconnected socket exception is thrown when we close the response output stream. There's no
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index ba23216..2dbdce6 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -515,7 +515,7 @@ namespace OpenSim.Region.DataSnapshot
515 m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace); 515 m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace);
516 } 516 }
517 // This is not quite working, so... 517 // This is not quite working, so...
518 string responseStr = ASCIIEncoding.UTF8.GetString(response); 518 string responseStr = Encoding.UTF8.GetString(response);
519 m_log.Info("[DATASNAPSHOT] data service notified: " + url); 519 m_log.Info("[DATASNAPSHOT] data service notified: " + url);
520 } 520 }
521 521
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 419ca8f..67c6ad2 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -583,7 +583,7 @@ namespace OpenSim.Region.ScriptEngine.Common
583 return objectname; 583 return objectname;
584 } 584 }
585 585
586 EntityBase SensedObject = null; 586 EntityBase SensedObject;
587 lock (World.Entities) 587 lock (World.Entities)
588 { 588 {
589 World.Entities.TryGetValue(objecUUID, out SensedObject); 589 World.Entities.TryGetValue(objecUUID, out SensedObject);
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
index 013ae0f..c293ecb 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ScriptEngine.Common
119 if (myIQS.QueueSize == 0) 119 if (myIQS.QueueSize == 0)
120 return; 120 return;
121 121
122 string receivedData = Encoding.ASCII.GetString(myIQS.Queue, 0, myIQS.QueueSize); 122 string receivedData = Encoding.UTF8.GetString(myIQS.Queue, 0, myIQS.QueueSize);
123 Debug.WriteLine("RAW: " + receivedData); 123 Debug.WriteLine("RAW: " + receivedData);
124 124
125 byte newLine = 10; 125 byte newLine = 10;
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Common
197 tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") 197 tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44")
198 } 198 }
199 tmpStr += "\n"; 199 tmpStr += "\n";
200 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr); 200 byte[] byteData = Encoding.UTF8.GetBytes(tmpStr);
201 TCPS.Send(ID, byteData, 0, byteData.Length); 201 TCPS.Send(ID, byteData, 0, byteData.Length);
202 } 202 }
203 } 203 }
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index e4a57e8..06ae1e9 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -289,10 +289,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
289 289
290 //} 290 //}
291 // READ EVENT CODE CHUNKS 291 // READ EVENT CODE CHUNKS
292 LSO_Struct.CodeChunk[] myEventCodeChunk;
293 if (myStateFrameBlock.StateCount > 0) 292 if (myStateFrameBlock.StateCount > 0)
294 { 293 {
295 myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount];
296 for (int i = 0; i < myStateFrameBlock.StateCount; i++) 294 for (int i = 0; i < myStateFrameBlock.StateCount; i++)
297 { 295 {
298 // TODO: Somehow organize events and functions so they can be found again, 296 // TODO: Somehow organize events and functions so they can be found again,
@@ -465,7 +463,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
465 // TODO: How to determine number of codechunks -- does this method work? 463 // TODO: How to determine number of codechunks -- does this method work?
466 myCodeChunk.CodeChunkArguments = new List<LSO_Struct.CodeChunkArgument>(); 464 myCodeChunk.CodeChunkArguments = new List<LSO_Struct.CodeChunkArgument>();
467 byte reader = br_read(1)[0]; 465 byte reader = br_read(1)[0];
468 reader = br_read(1)[0];
469 466
470 // NOTE ON CODE CHUNK ARGUMENTS 467 // NOTE ON CODE CHUNK ARGUMENTS
471 // This determins type definition 468 // This determins type definition
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 39babd6..c917e1e 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -656,21 +656,6 @@ namespace OpenSim.DataStore.MSSQL
656 656
657 657
658 s.ExtraParams = (byte[]) row["ExtraParams"]; 658 s.ExtraParams = (byte[]) row["ExtraParams"];
659 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
660 // string texture = encoding.GetString((Byte[])row["Texture"]);
661 // if (!texture.StartsWith("<"))
662 // {
663 // //here so that we can still work with old format database files (ie from before I added xml serialization)
664 // LLObject.TextureEntry textureEntry = null;
665 // textureEntry = new LLObject.TextureEntry(new LLUUID(texture));
666 // s.TextureEntry = textureEntry.ToBytes();
667 // }
668 // else
669 // {
670 // TextureBlock textureEntry = TextureBlock.FromXmlString(texture);
671 // s.TextureEntry = textureEntry.TextureData;
672 // s.ExtraParams = textureEntry.ExtraParams;
673 // }
674 659
675 return s; 660 return s;
676 } 661 }
diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs
index 61cc908..77e9044 100644
--- a/OpenSim/TestSuite/BotManager.cs
+++ b/OpenSim/TestSuite/BotManager.cs
@@ -197,7 +197,7 @@ namespace OpenSim.TestSuite
197 Environment.Exit(0); 197 Environment.Exit(0);
198 break; 198 break;
199 case "addbots": 199 case "addbots":
200 int newbots = 0; 200 int newbots;
201 Helpers.TryParse(cmdparams[0], out newbots); 201 Helpers.TryParse(cmdparams[0], out newbots);
202 202
203 if (newbots > 0) 203 if (newbots > 0)
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 8877f7d..302dc08 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -196,7 +196,7 @@ namespace pCampBot
196 Environment.Exit(0); 196 Environment.Exit(0);
197 break; 197 break;
198 case "addbots": 198 case "addbots":
199 int newbots = 0; 199 int newbots;
200 Helpers.TryParse(cmdparams[0], out newbots); 200 Helpers.TryParse(cmdparams[0], out newbots);
201 201
202 if (newbots > 0) 202 if (newbots > 0)
diff --git a/ThirdParty/3Di/LoadBalancer/TcpClient.cs b/ThirdParty/3Di/LoadBalancer/TcpClient.cs
index af678a0..ddd40cc 100644
--- a/ThirdParty/3Di/LoadBalancer/TcpClient.cs
+++ b/ThirdParty/3Di/LoadBalancer/TcpClient.cs
@@ -80,38 +80,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
80 } 80 }
81 } 81 }
82 82
83/*
84 public static void Receive(Socket client) {
85 try {
86 StateObject state = new StateObject();
87 state.workSocket = client;
88 client.BeginReceive( state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
89 } catch (Exception e) {
90 Console.WriteLine(e.ToString());
91 }
92 }
93
94 private static void ReceiveCallback( IAsyncResult ar ) {
95 try {
96 StateObject state = (StateObject) ar.AsyncState;
97 Socket client = state.workSocket;
98
99 int bytesRead = client.EndReceive(ar);
100 if (bytesRead > 0) {
101 state.sb.Append(Encoding.ASCII.GetString(state.buffer,0,bytesRead));
102 client.BeginReceive(state.buffer,0,StateObject.BufferSize,0, new AsyncCallback(ReceiveCallback), state);
103 } else {
104 if (state.sb.Length > 1) {
105 response = state.sb.ToString();
106 }
107 receiveDone.Set();
108 }
109 } catch (Exception e) {
110 Console.WriteLine(e.ToString());
111 }
112 }
113*/
114
115 public static void Send(Socket client, byte[] byteData) 83 public static void Send(Socket client, byte[] byteData)
116 { 84 {
117 client.BeginSend(byteData, 0, byteData.Length, 0, new AsyncCallback(SendCallback), client); 85 client.BeginSend(byteData, 0, byteData.Length, 0, new AsyncCallback(SendCallback), client);