From 20a9bf08f51351e1e0a9de94f184ff56cd572665 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 1 May 2008 18:04:42 +0000
Subject: * Rolled back a few changes.
---
.../Agent/AssetDownload/AssetDownloadModule.cs | 21 +++---
.../AssetTransaction/AgentAssetsTransactions.cs | 20 +++---
.../AssetTransaction/AssetTransactionModule.cs | 13 ++--
.../Agent/TextureDownload/TextureDownloadModule.cs | 9 ++-
.../Agent/TextureDownload/TextureNotFoundSender.cs | 6 +-
.../Modules/Agent/TextureSender/TextureSender.cs | 19 +++--
.../Environment/Modules/Agent/Xfer/XferModule.cs | 12 ++--
.../Environment/Modules/Avatar/Chat/ChatModule.cs | 56 +++++++--------
.../Currency/SampleMoney/SampleMoneyModule.cs | 80 +++++++++++-----------
.../Modules/Avatar/Friends/FriendsModule.cs | 34 ++++-----
.../Modules/Avatar/Groups/GroupsModule.cs | 10 +--
.../Modules/Avatar/Inventory/InventoryModule.cs | 2 +-
.../Avatar/Profiles/AvatarProfilesModule.cs | 6 +-
.../Environment/Modules/Framework/Commander.cs | 22 +++---
.../Modules/Framework/CommanderTestModule.cs | 2 +-
.../Modules/Grid/Interregion/InterregionModule.cs | 4 +-
.../DynamicTexture/DynamicTextureModule.cs | 10 +--
.../Scripting/HttpRequest/ScriptsHttpRequests.cs | 6 +-
.../Scripting/LoadImageURL/LoadImageURLModule.cs | 10 +--
.../Scripting/VectorRender/VectorRenderModule.cs | 10 ++-
.../Modules/Scripting/WorldComm/WorldCommModule.cs | 8 ++-
.../Modules/Scripting/XMLRPC/XMLRPCModule.cs | 24 +++----
.../Environment/Modules/World/Land/LandChannel.cs | 30 ++++----
.../Modules/World/Land/LandManagementModule.cs | 6 +-
.../Environment/Modules/World/Land/LandObject.cs | 30 ++++----
.../Modules/World/Serialiser/SerialiserModule.cs | 14 ++--
.../Environment/Modules/World/Sun/SunModule.cs | 2 +-
.../Modules/World/Terrain/Effects/CookieCutter.cs | 2 +-
.../Modules/World/Terrain/FileLoaders/LLRAW.cs | 4 +-
.../Modules/World/Terrain/FileLoaders/Terragen.cs | 6 +-
.../World/Terrain/PaintBrushes/FlattenSphere.cs | 1 +
.../World/Terrain/PaintBrushes/NoiseSphere.cs | 2 +-
.../World/Terrain/PaintBrushes/RevertSphere.cs | 2 +-
.../Modules/World/Terrain/TerrainException.cs | 2 +-
.../Modules/World/Terrain/TerrainModule.cs | 6 +-
.../World/TreePopulator/TreePopulatorModule.cs | 4 +-
36 files changed, 263 insertions(+), 232 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules')
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
index 550b673..48db51b 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
@@ -40,16 +40,15 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
///
/// Asset requests with data which are ready to be sent back to requesters. This includes textures.
///
- private readonly List AssetRequests;
+ private List AssetRequests;
- private readonly Dictionary RegisteredScenes = new Dictionary();
+ private Scene m_scene;
+ private Dictionary RegisteredScenes = new Dictionary();
///
/// Assets requests (for each user) which are waiting for asset server data. This includes texture requests
///
- private readonly Dictionary> RequestedAssets;
-
- private Scene m_scene;
+ private Dictionary> RequestedAssets;
public AssetDownloadModule()
{
@@ -206,18 +205,22 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
{
public AssetBase AssetInf;
public byte AssetRequestSource = 2;
- public long DataPointer;
+ public long DataPointer = 0;
public int DiscardLevel = -1;
public AssetBase ImageInfo;
public bool IsTextureRequest;
- public int NumPackets;
- public int PacketCounter;
- public byte[] Params;
+ public int NumPackets = 0;
+ public int PacketCounter = 0;
+ public byte[] Params = null;
public LLUUID RequestAssetID;
public IClientAPI RequestUser;
public LLUUID TransferRequestID;
//public bool AssetInCache;
//public int TimeRequested;
+
+ public AssetRequest()
+ {
+ }
}
#endregion
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 008daa2..555d5f4 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// Fields
- private readonly bool m_dumpAssetsToFile;
+ private bool m_dumpAssetsToFile;
public AgentAssetTransactionsManager Manager;
public LLUUID UserID;
public Dictionary XferUploaders = new Dictionary();
@@ -141,23 +141,23 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
public class AssetXferUploader
{
// Fields
- private readonly bool m_dumpAssetToFile;
- private readonly AgentAssetTransactions m_userTransactions;
public bool AddToInventory;
public AssetBase Asset;
public LLUUID InventFolder = LLUUID.Zero;
- private sbyte invType;
- private bool m_createItem;
+ private sbyte invType = 0;
+ private bool m_createItem = false;
private string m_description = String.Empty;
- private bool m_finished;
+ private bool m_dumpAssetToFile;
+ private bool m_finished = false;
private string m_name = String.Empty;
private bool m_storeLocal;
- private uint nextPerm;
+ private AgentAssetTransactions m_userTransactions;
+ private uint nextPerm = 0;
private IClientAPI ourClient;
public LLUUID TransactionID = LLUUID.Zero;
- private sbyte type;
+ private sbyte type = 0;
public bool UploadComplete;
- private byte wearableType;
+ private byte wearableType = 0;
public ulong XferID;
public AssetXferUploader(AgentAssetTransactions transactions, bool dumpAssetToFile)
@@ -390,7 +390,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
item.BasePermissions = 2147483647;
item.CurrentPermissions = 2147483647;
item.NextPermissions = nextPerm;
- item.Flags = wearableType;
+ item.Flags = (uint) wearableType;
userInfo.AddItem(ourClient.AgentId, item);
ourClient.SendInventoryItemCreateUpdate(item);
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
index d7f5804..fcd0e0c 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -40,11 +40,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions
{
private readonly Dictionary RegisteredScenes = new Dictionary();
- private bool m_dumpAssetsToFile;
- private Scene m_scene;
+ private bool m_dumpAssetsToFile = false;
+ private Scene m_scene = null;
private AgentAssetTransactionsManager m_transactionManager;
+ public AssetTransactionModule()
+ {
+ // System.Console.WriteLine("creating AgentAssetTransactionModule");
+ }
+
#region IAgentAssetTransactions Members
public void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID,
@@ -140,13 +145,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
///
/// Each agent has its own singleton collection of transactions
///
- private readonly Dictionary AgentTransactions =
+ private Dictionary AgentTransactions =
new Dictionary();
///
/// Should we dump uploaded assets to the filesystem?
///
- private readonly bool m_dumpAssetsToFile;
+ private bool m_dumpAssetsToFile;
public Scene MyScene;
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
index 96ef61f..474ac75 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -47,8 +47,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
private readonly BlockingQueue m_queueSenders
= new BlockingQueue();
- private readonly List m_scenes = new List();
-
///
/// Each user has their own texture download service.
///
@@ -56,9 +54,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
new Dictionary();
private Scene m_scene;
+ private List m_scenes = new List();
private Thread m_thread;
+ public TextureDownloadModule()
+ {
+ }
+
#region IRegionModule Members
public void Initialise(Scene scene, IConfigSource config)
@@ -66,7 +69,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
if (m_scene == null)
{
//Console.WriteLine("Creating Texture download module");
- m_thread = new Thread(ProcessTextureSenders);
+ m_thread = new Thread(new ThreadStart(ProcessTextureSenders));
m_thread.Name = "ProcessTextureSenderThread";
m_thread.IsBackground = true;
m_thread.Start();
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 7d4c919..70e44d4 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -40,13 +40,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
//private static readonly log4net.ILog m_log
// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
- private readonly LLUUID m_textureId;
- private bool m_cancel;
+ private bool m_cancel = false;
private IClientAPI m_client;
// See ITextureSender
- private bool m_sending;
+ private bool m_sending = false;
+ private LLUUID m_textureId;
// See ITextureSender
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index 44b9a23..02c541b 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -43,14 +43,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private readonly IClientAPI RequestUser;
-
///
/// Records the number of times texture send has been called.
///
- public int counter;
+ public int counter = 0;
- public bool ImageLoaded;
+ public bool ImageLoaded = false;
///
/// Holds the texture asset to send.
@@ -59,26 +57,27 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
//public LLUUID assetID { get { return m_asset.FullID; } }
- private bool m_cancel;
+ private bool m_cancel = false;
// See ITextureSender
- private bool m_sending;
+ private bool m_sending = false;
///
/// This is actually the number of extra packets required to send the texture data! We always assume
/// at least one is required.
///
- private int NumPackets;
+ private int NumPackets = 0;
///
/// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts
/// at the 600th byte (0th indexed).
///
- private int PacketCounter;
+ private int PacketCounter = 0;
private int RequestedDiscardLevel = -1;
- private uint StartPacketNumber;
+ private IClientAPI RequestUser;
+ private uint StartPacketNumber = 0;
public TextureSender(IClientAPI client, int discardLevel, uint packetNumber)
{
@@ -191,7 +190,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
catch (ArgumentOutOfRangeException)
{
m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" +
- m_asset.FullID);
+ m_asset.FullID.ToString());
return;
}
RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
index eaf2198..8e90d17 100644
--- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
@@ -41,6 +41,10 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer
public Dictionary NewFiles = new Dictionary();
public Dictionary Transfers = new Dictionary();
+ public XferModule()
+ {
+ }
+
#region IRegionModule Members
public void Initialise(Scene scene, IConfigSource config)
@@ -145,11 +149,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer
public IClientAPI Client;
private bool complete;
public byte[] Data = new byte[0];
- public int DataPointer;
+ public int DataPointer = 0;
public string FileName = String.Empty;
- public uint Packet;
+ public uint Packet = 0;
public uint Serial = 1;
- public ulong XferID;
+ public ulong XferID = 0;
public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client)
{
@@ -213,7 +217,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer
{
byte[] transferData = new byte[Data.Length - DataPointer];
Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer);
- uint endPacket = Packet |= 0x80000000;
+ uint endPacket = Packet |= (uint) 0x80000000;
Client.SendXferPacket(XferID, endPacket, transferData);
Packet++;
DataPointer += (Data.Length - DataPointer);
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index 8d42681..15720fc 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -44,15 +44,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
public class ChatModule : IRegionModule, ISimChat
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private readonly List m_scenes = new List();
- private string m_defaultzone;
+ private string m_defaultzone = null;
- private IRCChatModule m_irc;
- private Thread m_irc_connector;
+ private IRCChatModule m_irc = null;
+ private Thread m_irc_connector = null;
- private string m_last_leaving_user;
- private string m_last_new_user;
+ private string m_last_leaving_user = null;
+ private string m_last_new_user = null;
private int m_saydistance = 30;
+ private List m_scenes = new List();
private int m_shoutdistance = 100;
internal object m_syncInit = new object();
internal object m_syncLogout = new object();
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
catch (Exception ex)
{
- m_log.Error("[IRC]: NewClient exception trap:" + ex);
+ m_log.Error("[IRC]: NewClient exception trap:" + ex.ToString());
}
}
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
catch (Exception ex)
{
- m_log.Error("[IRC]: ClientLoggedOut exception trap:" + ex);
+ m_log.Error("[IRC]: ClientLoggedOut exception trap:" + ex.ToString());
}
}
}
@@ -372,24 +372,24 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
#endregion
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- private readonly string m_basenick;
- private readonly string m_channel;
- private readonly bool m_enabled;
- private readonly uint m_port = 6668;
- private readonly string m_privmsgformat = "PRIVMSG {0} :<{1} in {2}>: {3}";
- private readonly string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot";
private Thread listener;
- private bool m_connected;
- private List m_last_scenes;
- private string m_nick;
+
+ private string m_basenick = null;
+ private string m_channel = null;
+ private bool m_connected = false;
+ private bool m_enabled = false;
+ private List m_last_scenes = null;
+ private string m_nick = null;
+ private uint m_port = 6668;
+ private string m_privmsgformat = "PRIVMSG {0} :<{1} in {2}>: {3}";
private StreamReader m_reader;
- private List m_scenes;
- private string m_server;
+ private List m_scenes = null;
+ private string m_server = null;
private NetworkStream m_stream;
internal object m_syncConnect = new object();
private TcpClient m_tcp;
+ private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot";
private StreamWriter m_writer;
private Thread pingSender;
@@ -478,13 +478,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
m_reader = new StreamReader(m_stream);
m_writer = new StreamWriter(m_stream);
- pingSender = new Thread(PingRun);
+ pingSender = new Thread(new ThreadStart(PingRun));
pingSender.Name = "PingSenderThread";
pingSender.IsBackground = true;
pingSender.Start();
ThreadTracker.Add(pingSender);
- listener = new Thread(ListenerRun);
+ listener = new Thread(new ThreadStart(ListenerRun));
listener.Name = "IRCChatModuleListenerThread";
listener.IsBackground = true;
listener.Start();
@@ -545,7 +545,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
catch (Exception ex)
{
- m_log.Error("[IRC]: PrivMsg exception trap:" + ex);
+ m_log.Error("[IRC]: PrivMsg exception trap:" + ex.ToString());
}
}
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{
try
{
- if (m_connected)
+ if (m_connected == true)
{
m_writer.WriteLine("PING :" + m_server);
m_writer.Flush();
@@ -602,7 +602,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
catch (Exception ex)
{
- m_log.Error("[IRC]: PingRun exception trap:" + ex + "\n" + ex.StackTrace);
+ m_log.Error("[IRC]: PingRun exception trap:" + ex.ToString() + "\n" + ex.StackTrace);
}
}
}
@@ -615,7 +615,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{
try
{
- while (m_connected && ((inputLine = m_reader.ReadLine()) != null))
+ while ((m_connected == true) && ((inputLine = m_reader.ReadLine()) != null))
{
// Console.WriteLine(inputLine);
if (inputLine.Contains(m_channel))
@@ -659,7 +659,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
catch (Exception ex)
{
- m_log.Error("[IRC]: ListenerRun exception trap:" + ex + "\n" + ex.StackTrace);
+ m_log.Error("[IRC]: ListenerRun exception trap:" + ex.ToString() + "\n" + ex.StackTrace);
}
}
}
@@ -685,7 +685,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
}
catch (Exception ex) // IRC gate should not crash Sim
{
- m_log.Error("[IRC]: BroadcastSim Exception Trap:" + ex + "\n" + ex.StackTrace);
+ m_log.Error("[IRC]: BroadcastSim Exception Trap:" + ex.ToString() + "\n" + ex.StackTrace);
}
}
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index cc6fd77..966c5e2 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -65,55 +65,55 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
public class SampleMoneyModule : IMoneyModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private readonly Dictionary m_KnownClientFunds = new Dictionary();
-
- ///
- /// Region UUIDS indexed by AgentID
- ///
- private readonly Dictionary m_rootAgents = new Dictionary();
-
- ///
- /// Scenes by Region Handle
- ///
- private readonly Dictionary m_scenel = new Dictionary();
///
/// Where Stipends come from and Fees go to.
///
private LLUUID EconomyBaseAccount = LLUUID.Zero;
- private float EnergyEfficiency;
- private bool gridmode;
+ private float EnergyEfficiency = 0f;
+ private bool gridmode = false;
private ObjectPaid handerOnObjectPaid;
private bool m_enabled = true;
private IConfigSource m_gConfig;
private bool m_keepMoneyAcrossLogins = true;
+ private Dictionary m_KnownClientFunds = new Dictionary();
private string m_LandAddress = String.Empty;
private int m_minFundsBeforeRefresh = 100;
private string m_MoneyAddress = String.Empty;
+ ///
+ /// Region UUIDS indexed by AgentID
+ ///
+ private Dictionary m_rootAgents = new Dictionary();
+
+ ///
+ /// Scenes by Region Handle
+ ///
+ private Dictionary m_scenel = new Dictionary();
+
private int m_stipend = 1000;
private int ObjectCapacity = 45000;
- private int ObjectCount;
- private int PriceEnergyUnit;
- private int PriceGroupCreate;
- private int PriceObjectClaim;
- private float PriceObjectRent;
- private float PriceObjectScaleFactor;
- private int PriceParcelClaim;
- private float PriceParcelClaimFactor;
- private int PriceParcelRent;
- private int PricePublicObjectDecay;
- private int PricePublicObjectDelete;
- private int PriceRentLight;
- private int PriceUpload;
- private int TeleportMinPrice;
-
- private float TeleportPriceExponent;
+ private int ObjectCount = 0;
+ private int PriceEnergyUnit = 0;
+ private int PriceGroupCreate = 0;
+ private int PriceObjectClaim = 0;
+ private float PriceObjectRent = 0f;
+ private float PriceObjectScaleFactor = 0f;
+ private int PriceParcelClaim = 0;
+ private float PriceParcelClaimFactor = 0f;
+ private int PriceParcelRent = 0;
+ private int PricePublicObjectDecay = 0;
+ private int PricePublicObjectDelete = 0;
+ private int PriceRentLight = 0;
+ private int PriceUpload = 0;
+ private int TeleportMinPrice = 0;
+
+ private float TeleportPriceExponent = 0f;
private int UserLevelPaysFees = 2;
private Scene XMLRPCHandler;
@@ -305,7 +305,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
Hashtable hbinfo =
GetBalanceForUserFromMoneyServer(client.AgentId, client.SecureSessionId, s.RegionInfo.originRegionID.ToString(),
s.RegionInfo.regionSecret);
- if ((bool) hbinfo["success"])
+ if ((bool) hbinfo["success"] == true)
{
Helpers.TryParse((string) hbinfo["agentId"], out agentID);
try
@@ -333,7 +333,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
else
{
m_log.WarnFormat("[MONEY]: Getting Money for user {0} failed with the following message:{1}", agentID,
- hbinfo["errorMessage"]);
+ (string) hbinfo["errorMessage"]);
client.SendAlertMessage((string) hbinfo["errorMessage"]);
}
SendMoneyBalance(client, agentID, client.SessionId, LLUUID.Zero);
@@ -660,7 +660,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
Hashtable hresult = genericCurrencyXMLRPCRequest(ht, "regionMoveMoney");
- if ((bool) hresult["success"])
+ if ((bool) hresult["success"] == true)
{
int funds1 = 0;
int funds2 = 0;
@@ -718,7 +718,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
Hashtable hbinfo =
GetBalanceForUserFromMoneyServer(aClient.AgentId, aClient.SecureSessionId, s.RegionInfo.originRegionID.ToString(),
s.RegionInfo.regionSecret);
- if ((bool) hbinfo["success"])
+ if ((bool) hbinfo["success"] == true)
{
try
{
@@ -743,7 +743,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
else
{
m_log.WarnFormat("[MONEY]: Getting Money for user {0} failed with the following message:{1}", agentId,
- hbinfo["errorMessage"]);
+ (string) hbinfo["errorMessage"]);
aClient.SendAlertMessage((string) hbinfo["errorMessage"]);
}
}
@@ -812,7 +812,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
string secret = (string) requestData["secret"];
Scene userScene = GetRandomScene();
- if (userScene.RegionInfo.regionSecret == secret)
+ if (userScene.RegionInfo.regionSecret.ToString() == secret)
{
IClientAPI client = LocateClientObject(agentId);
@@ -1238,7 +1238,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
{
lock (e)
{
- if (e.economyValidated && e.transactionID == 0)
+ if (e.economyValidated == true && e.transactionID == 0)
{
e.transactionID = Util.UnixTimeSinceEpoch();
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
else
{
m_log.Warn("[MONEY]: Potential Fraud Warning, got money transfer request for avatar that isn't in this simulator - Details; Sender:" +
- e.sender + " Receiver: " + e.receiver + " Amount: " + e.amount);
+ e.sender.ToString() + " Receiver: " + e.receiver.ToString() + " Amount: " + e.amount.ToString());
}
}
@@ -1400,7 +1400,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
{
Hashtable hresult =
claim_user(avatar.UUID, avatar.ControllingClient.SecureSessionId, regionID, RegionItem.RegionInfo.regionSecret);
- if ((bool) hresult["success"])
+ if ((bool) hresult["success"] == true)
{
int funds = 0;
try
@@ -1432,7 +1432,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
if (RegionItem != null)
{
Hashtable hresult = claim_user(avatar.UUID, avatar.ControllingClient.SecureSessionId, regionID, RegionItem.RegionInfo.regionSecret);
- if ((bool) hresult["success"])
+ if ((bool) hresult["success"] == true)
{
int funds = 0;
try
@@ -1460,7 +1460,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
#endregion
}
- public enum TransactionType
+ public enum TransactionType : int
{
SystemGenerated = 0,
RegionMoneyRequest = 1,
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 1dffc62..dd6a92e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -42,10 +42,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private readonly Dictionary> FriendLists = new Dictionary>();
- private readonly Dictionary m_pendingFriendRequests = new Dictionary();
- private readonly Dictionary m_rootAgents = new Dictionary();
- private readonly List m_scene = new List();
+ private Dictionary> FriendLists = new Dictionary>();
+ private Dictionary m_pendingFriendRequests = new Dictionary();
+ private Dictionary m_rootAgents = new Dictionary();
+ private List m_scene = new List();
#region IRegionModule Members
@@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
List updateUsers = new List();
foreach (FriendListItem fli in lfli)
{
- if (fli.onlinestatus)
+ if (fli.onlinestatus == true)
{
updateUsers.Add(fli.Friend);
}
@@ -357,20 +357,20 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
// https://wiki.secondlife.com/wiki/ImprovedInstantMessage
// 38 == Offer friendship
- if (dialog == 38)
+ if (dialog == (byte) 38)
{
LLUUID friendTransactionID = LLUUID.Random();
m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
- m_log.Info("[FRIEND]: 38 - From:" + fromAgentID + " To: " + toAgentID + " Session:" + imSessionID + " Message:" +
+ m_log.Info("[FRIEND]: 38 - From:" + fromAgentID.ToString() + " To: " + toAgentID.ToString() + " Session:" + imSessionID.ToString() + " Message:" +
message);
GridInstantMessage msg = new GridInstantMessage();
msg.fromAgentID = fromAgentID.UUID;
msg.fromAgentSession = fromAgentSession.UUID;
msg.toAgentID = toAgentID.UUID;
msg.imSessionID = friendTransactionID.UUID; // This is the item we're mucking with here
- m_log.Info("[FRIEND]: Filling Session: " + msg.imSessionID);
+ m_log.Info("[FRIEND]: Filling Session: " + msg.imSessionID.ToString());
msg.timestamp = timestamp;
if (client != null)
{
@@ -393,16 +393,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
}
// 39 == Accept Friendship
- if (dialog == 39)
+ if (dialog == (byte) 39)
{
- m_log.Info("[FRIEND]: 39 - From:" + fromAgentID + " To: " + toAgentID + " Session:" + imSessionID + " Message:" +
+ m_log.Info("[FRIEND]: 39 - From:" + fromAgentID.ToString() + " To: " + toAgentID.ToString() + " Session:" + imSessionID.ToString() + " Message:" +
message);
}
// 40 == Decline Friendship
- if (dialog == 40)
+ if (dialog == (byte) 40)
{
- m_log.Info("[FRIEND]: 40 - From:" + fromAgentID + " To: " + toAgentID + " Session:" + imSessionID + " Message:" +
+ m_log.Info("[FRIEND]: 40 - From:" + fromAgentID.ToString() + " To: " + toAgentID.ToString() + " Session:" + imSessionID.ToString() + " Message:" +
message);
}
}
@@ -433,14 +433,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
msg.ParentEstateID = 0;
msg.timestamp = (uint) Util.UnixTimeSinceEpoch();
msg.RegionID = SceneAgentIn.RegionInfo.RegionID.UUID;
- msg.dialog = 39; // Approved friend request
+ msg.dialog = (byte) 39; // Approved friend request
msg.Position = new sLLVector3();
- msg.offline = 0;
+ msg.offline = (byte) 0;
msg.binaryBucket = new byte[0];
// We don't really care which scene we pipe it through, it goes to the shared IM Module and/or the database
SceneAgentIn.TriggerGridInstantMessage(msg, InstantMessageReceiver.IMModule);
- SceneAgentIn.StoreAddFriendship(m_pendingFriendRequests[transactionID], agentID, 1);
+ SceneAgentIn.StoreAddFriendship(m_pendingFriendRequests[transactionID], agentID, (uint) 1);
m_pendingFriendRequests.Remove(transactionID);
// TODO: Inform agent that the friend is online
@@ -471,9 +471,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
msg.ParentEstateID = 0;
msg.timestamp = (uint) Util.UnixTimeSinceEpoch();
msg.RegionID = SceneAgentIn.RegionInfo.RegionID.UUID;
- msg.dialog = 40; // Deny friend request
+ msg.dialog = (byte) 40; // Deny friend request
msg.Position = new sLLVector3();
- msg.offline = 0;
+ msg.offline = (byte) 0;
msg.binaryBucket = new byte[0];
SceneAgentIn.TriggerGridInstantMessage(msg, InstantMessageReceiver.IMModule);
m_pendingFriendRequests.Remove(transactionID);
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
index 858cf21..6edc44d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
@@ -41,10 +41,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private readonly Dictionary m_grouplistmap = new Dictionary();
- private readonly Dictionary m_groupmap = new Dictionary();
- private readonly Dictionary m_iclientmap = new Dictionary();
- private readonly List m_scene = new List();
+ private Dictionary m_grouplistmap = new Dictionary();
+ private Dictionary m_groupmap = new Dictionary();
+ private Dictionary m_iclientmap = new Dictionary();
+ private List m_scene = new List();
#region IRegionModule Members
@@ -214,7 +214,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
}
else
{
- m_log.Info("[GROUP]: Removing all reference to groups for " + agentID);
+ m_log.Info("[GROUP]: Removing all reference to groups for " + agentID.ToString());
}
m_iclientmap.Remove(agentID);
}
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
index 9f2d461..624f307 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory
/// occurs in the initial offer message, not the accept message. So this dictionary links
/// IM Session Ids to ItemIds
///
- private readonly IDictionary m_pendingOffers = new Dictionary();
+ private IDictionary m_pendingOffers = new Dictionary();
private Scene m_scene;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index 87f0177..15825b6 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -41,6 +41,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene;
+ public AvatarProfilesModule()
+ {
+ }
+
#region IRegionModule Members
public void Initialise(Scene scene, IConfigSource config)
@@ -100,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
}
else
{
- m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID);
+ m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());
}
}
diff --git a/OpenSim/Region/Environment/Modules/Framework/Commander.cs b/OpenSim/Region/Environment/Modules/Framework/Commander.cs
index d226c3d..4430c10 100644
--- a/OpenSim/Region/Environment/Modules/Framework/Commander.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/Commander.cs
@@ -42,11 +42,11 @@ namespace OpenSim.Region.Environment.Modules.Framework
public class Command : ICommand
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private readonly List m_args = new List();
+ private List m_args = new List();
- private readonly Action