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. --- .../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 +- 6 files changed, 96 insertions(+), 92 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Avatar') 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()); } } -- cgit v1.1