OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

killing warnings, reformatting RemoteAdminPlugin

0.6.1-post-fixes
Dr Scofield 2008-12-05 15:28:03 +00:00
parent 336daa1aa8
commit bdffd56a45
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -380,7 +380,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
int m_regionLimit = m_config.GetInt("region_limit", 0); int m_regionLimit = m_config.GetInt("region_limit", 0);
try { try {
@ -574,7 +575,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
try { try {
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
checkStringParameters(request, new string[] {"password", "region_name"}); checkStringParameters(request, new string[] {"password", "region_name"});
@ -649,7 +651,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
try try
{ {
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
@ -675,12 +678,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (null != userProfile) if (null != userProfile)
throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
UUID userID UUID userID = m_app.CommunicationsManager.UserAdminService.AddUser(firstname, lastname,
= m_app.CommunicationsManager.UserAdminService.AddUser( passwd, email, regX, regY);
firstname, lastname, passwd, email, regX, regY);
if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
firstname, lastname)); firstname, lastname));
responseData["success"] = "true"; responseData["success"] = "true";
responseData["avatar_uuid"] = userID.ToString(); responseData["avatar_uuid"] = userID.ToString();
@ -749,7 +751,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
try try
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
@ -917,7 +920,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
try try
{ {
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
@ -1043,7 +1047,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
try try
{ {
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
@ -1194,8 +1199,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
lock (this) { lock(this)
{
try try
{ {
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];

9
OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
View File

@ -270,11 +270,10 @@ namespace OpenSim.Framework.Communications.Cache
// passphrase and salt value. The password will be created using // passphrase and salt value. The password will be created using
// the specified hash algorithm. Password creation can be done in // the specified hash algorithm. Password creation can be done in
// several iterations. // several iterations.
PasswordDeriveBytes password = new PasswordDeriveBytes( PasswordDeriveBytes password = new PasswordDeriveBytes(passPhrase,
passPhrase, saltValueBytes,
saltValueBytes, hashAlgorithm,
hashAlgorithm, passwordIterations);
passwordIterations);
// Use the password to generate pseudo-random bytes for the encryption // Use the password to generate pseudo-random bytes for the encryption
// key. Specify the size of the key in bytes (instead of bits). // key. Specify the size of the key in bytes (instead of bits).

2
OpenSim/Framework/Communications/LoginService.cs
View File

@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
try try
{ {
bool GoodLogin = false; // bool GoodLogin = false;
string startLocationRequest = "last"; string startLocationRequest = "last";

2
OpenSim/Region/Physics/Meshing/PrimMesher.cs
View File

@ -709,7 +709,7 @@ namespace PrimMesher
for (int i = 0; i < numAngles; i++) for (int i = 0; i < numAngles; i++)
{ {
int iNext = i == numAngles ? i + 1 : 0; // int iNext = i == numAngles ? i + 1 : 0;
angle = angles.angles[i]; angle = angles.angles[i];
newVert.X = angle.X * xScale; newVert.X = angle.X * xScale;
newVert.Y = angle.Y * yScale; newVert.Y = angle.Y * yScale;