diff options
Diffstat (limited to '')
4 files changed, 23 insertions, 19 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 16fe6f9..9e48005 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -380,7 +380,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
380 | XmlRpcResponse response = new XmlRpcResponse(); | 380 | XmlRpcResponse response = new XmlRpcResponse(); |
381 | Hashtable responseData = new Hashtable(); | 381 | Hashtable responseData = new Hashtable(); |
382 | 382 | ||
383 | lock (this) { | 383 | lock(this) |
384 | { | ||
384 | int m_regionLimit = m_config.GetInt("region_limit", 0); | 385 | int m_regionLimit = m_config.GetInt("region_limit", 0); |
385 | 386 | ||
386 | try { | 387 | try { |
@@ -574,7 +575,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
574 | XmlRpcResponse response = new XmlRpcResponse(); | 575 | XmlRpcResponse response = new XmlRpcResponse(); |
575 | Hashtable responseData = new Hashtable(); | 576 | Hashtable responseData = new Hashtable(); |
576 | 577 | ||
577 | lock (this) { | 578 | lock(this) |
579 | { | ||
578 | try { | 580 | try { |
579 | Hashtable requestData = (Hashtable) request.Params[0]; | 581 | Hashtable requestData = (Hashtable) request.Params[0]; |
580 | checkStringParameters(request, new string[] {"password", "region_name"}); | 582 | checkStringParameters(request, new string[] {"password", "region_name"}); |
@@ -649,7 +651,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
649 | XmlRpcResponse response = new XmlRpcResponse(); | 651 | XmlRpcResponse response = new XmlRpcResponse(); |
650 | Hashtable responseData = new Hashtable(); | 652 | Hashtable responseData = new Hashtable(); |
651 | 653 | ||
652 | lock (this) { | 654 | lock(this) |
655 | { | ||
653 | try | 656 | try |
654 | { | 657 | { |
655 | Hashtable requestData = (Hashtable) request.Params[0]; | 658 | Hashtable requestData = (Hashtable) request.Params[0]; |
@@ -675,12 +678,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
675 | if (null != userProfile) | 678 | if (null != userProfile) |
676 | throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); | 679 | throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); |
677 | 680 | ||
678 | UUID userID | 681 | UUID userID = m_app.CommunicationsManager.UserAdminService.AddUser(firstname, lastname, |
679 | = m_app.CommunicationsManager.UserAdminService.AddUser( | 682 | passwd, email, regX, regY); |
680 | firstname, lastname, passwd, email, regX, regY); | ||
681 | 683 | ||
682 | if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", | 684 | if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", |
683 | firstname, lastname)); | 685 | firstname, lastname)); |
684 | 686 | ||
685 | responseData["success"] = "true"; | 687 | responseData["success"] = "true"; |
686 | responseData["avatar_uuid"] = userID.ToString(); | 688 | responseData["avatar_uuid"] = userID.ToString(); |
@@ -749,7 +751,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
749 | XmlRpcResponse response = new XmlRpcResponse(); | 751 | XmlRpcResponse response = new XmlRpcResponse(); |
750 | Hashtable responseData = new Hashtable(); | 752 | Hashtable responseData = new Hashtable(); |
751 | 753 | ||
752 | lock (this) { | 754 | lock(this) |
755 | { | ||
753 | try | 756 | try |
754 | { | 757 | { |
755 | Hashtable requestData = (Hashtable)request.Params[0]; | 758 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -917,7 +920,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
917 | XmlRpcResponse response = new XmlRpcResponse(); | 920 | XmlRpcResponse response = new XmlRpcResponse(); |
918 | Hashtable responseData = new Hashtable(); | 921 | Hashtable responseData = new Hashtable(); |
919 | 922 | ||
920 | lock (this) { | 923 | lock(this) |
924 | { | ||
921 | try | 925 | try |
922 | { | 926 | { |
923 | Hashtable requestData = (Hashtable) request.Params[0]; | 927 | Hashtable requestData = (Hashtable) request.Params[0]; |
@@ -1043,7 +1047,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1043 | XmlRpcResponse response = new XmlRpcResponse(); | 1047 | XmlRpcResponse response = new XmlRpcResponse(); |
1044 | Hashtable responseData = new Hashtable(); | 1048 | Hashtable responseData = new Hashtable(); |
1045 | 1049 | ||
1046 | lock (this) { | 1050 | lock(this) |
1051 | { | ||
1047 | try | 1052 | try |
1048 | { | 1053 | { |
1049 | Hashtable requestData = (Hashtable) request.Params[0]; | 1054 | Hashtable requestData = (Hashtable) request.Params[0]; |
@@ -1194,8 +1199,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1194 | XmlRpcResponse response = new XmlRpcResponse(); | 1199 | XmlRpcResponse response = new XmlRpcResponse(); |
1195 | Hashtable responseData = new Hashtable(); | 1200 | Hashtable responseData = new Hashtable(); |
1196 | 1201 | ||
1197 | lock (this) { | 1202 | lock(this) |
1198 | 1203 | { | |
1199 | try | 1204 | try |
1200 | { | 1205 | { |
1201 | Hashtable requestData = (Hashtable) request.Params[0]; | 1206 | Hashtable requestData = (Hashtable) request.Params[0]; |
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs index 8e88844..3ed9172 100644 --- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs | |||
@@ -270,11 +270,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
270 | // passphrase and salt value. The password will be created using | 270 | // passphrase and salt value. The password will be created using |
271 | // the specified hash algorithm. Password creation can be done in | 271 | // the specified hash algorithm. Password creation can be done in |
272 | // several iterations. | 272 | // several iterations. |
273 | PasswordDeriveBytes password = new PasswordDeriveBytes( | 273 | PasswordDeriveBytes password = new PasswordDeriveBytes(passPhrase, |
274 | passPhrase, | 274 | saltValueBytes, |
275 | saltValueBytes, | 275 | hashAlgorithm, |
276 | hashAlgorithm, | 276 | passwordIterations); |
277 | passwordIterations); | ||
278 | 277 | ||
279 | // Use the password to generate pseudo-random bytes for the encryption | 278 | // Use the password to generate pseudo-random bytes for the encryption |
280 | // key. Specify the size of the key in bytes (instead of bits). | 279 | // key. Specify the size of the key in bytes (instead of bits). |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 90c5206..24e9ca9 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications | |||
350 | 350 | ||
351 | try | 351 | try |
352 | { | 352 | { |
353 | bool GoodLogin = false; | 353 | // bool GoodLogin = false; |
354 | 354 | ||
355 | string startLocationRequest = "last"; | 355 | string startLocationRequest = "last"; |
356 | 356 | ||
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index d79a480..f00a05c 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -709,7 +709,7 @@ namespace PrimMesher | |||
709 | 709 | ||
710 | for (int i = 0; i < numAngles; i++) | 710 | for (int i = 0; i < numAngles; i++) |
711 | { | 711 | { |
712 | int iNext = i == numAngles ? i + 1 : 0; | 712 | // int iNext = i == numAngles ? i + 1 : 0; |
713 | angle = angles.angles[i]; | 713 | angle = angles.angles[i]; |
714 | newVert.X = angle.X * xScale; | 714 | newVert.X = angle.X * xScale; |
715 | newVert.Y = angle.Y * yScale; | 715 | newVert.Y = angle.Y * yScale; |