diff options
author | Teravus Ovares | 2008-05-14 04:06:33 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-14 04:06:33 +0000 |
commit | 8fd0378ae6d7aa7b85bbbd011ab24991f261770a (patch) | |
tree | f9f921dc9203d51a6c34242fe68fadd2071b040a /OpenSim | |
parent | * Refactored OutPacket and FirstName/LastName out of Friends Module. (diff) | |
download | opensim-SC-8fd0378ae6d7aa7b85bbbd011ab24991f261770a.zip opensim-SC-8fd0378ae6d7aa7b85bbbd011ab24991f261770a.tar.gz opensim-SC-8fd0378ae6d7aa7b85bbbd011ab24991f261770a.tar.bz2 opensim-SC-8fd0378ae6d7aa7b85bbbd011ab24991f261770a.tar.xz |
* Removed 19 warnings
Diffstat (limited to 'OpenSim')
6 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 9f3429e..9e5f376 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | |||
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
252 | 252 | ||
253 | if ((m_irc.Enabled) && (m_irc.Connected)) | 253 | if ((m_irc.Enabled) && (m_irc.Connected)) |
254 | { | 254 | { |
255 | string clientName = client.FirstName + " " + client.LastName; | 255 | string clientName = client.Name; |
256 | // handles simple case. May not work for hundred connecting in per second. | 256 | // handles simple case. May not work for hundred connecting in per second. |
257 | // and the NewClients calles getting interleved | 257 | // and the NewClients calles getting interleved |
258 | // but filters out multiple reports | 258 | // but filters out multiple reports |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs index 6edc44d..f9e81f0 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
139 | m_grouplistmap.Add(client.AgentId, testGroupList); | 139 | m_grouplistmap.Add(client.AgentId, testGroupList); |
140 | } | 140 | } |
141 | } | 141 | } |
142 | m_log.Info("[GROUP]: Adding " + client.FirstName + " " + client.LastName + " to OpenSimulator Tester group"); | 142 | m_log.Info("[GROUP]: Adding " + client.Name + " to OpenSimulator Tester group"); |
143 | } | 143 | } |
144 | 144 | ||
145 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, LLUUID AgentID, LLUUID SessionID) | 145 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, LLUUID AgentID, LLUUID SessionID) |
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
210 | IClientAPI cli = m_iclientmap[agentID]; | 210 | IClientAPI cli = m_iclientmap[agentID]; |
211 | if (cli != null) | 211 | if (cli != null) |
212 | { | 212 | { |
213 | m_log.Info("[GROUP]: Removing all reference to groups for " + cli.FirstName + " " + cli.LastName); | 213 | m_log.Info("[GROUP]: Removing all reference to groups for " + cli.Name); |
214 | } | 214 | } |
215 | else | 215 | else |
216 | { | 216 | { |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs index 9121f7a..7a15708 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -326,7 +326,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
326 | { | 326 | { |
327 | DeliverMessage(e.Type, | 327 | DeliverMessage(e.Type, |
328 | e.Channel, | 328 | e.Channel, |
329 | e.Sender.FirstName + " " + e.Sender.LastName, | 329 | e.Sender.Name, |
330 | e.Sender.AgentId, | 330 | e.Sender.AgentId, |
331 | e.Message); | 331 | e.Message); |
332 | } | 332 | } |
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 5800f70..b7f39ca 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -787,7 +787,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
787 | { | 787 | { |
788 | if (!presence.IsChildAgent) | 788 | if (!presence.IsChildAgent) |
789 | { | 789 | { |
790 | string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName; | 790 | string name = presence.ControllingClient.Name; |
791 | 791 | ||
792 | if (String.Compare(avatarName, name, true) == 0) | 792 | if (String.Compare(avatarName, name, true) == 0) |
793 | { | 793 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index a2c16b6..4050f36 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -6170,7 +6170,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
6170 | { | 6170 | { |
6171 | ScenePresence av = World.GetScenePresence(key); | 6171 | ScenePresence av = World.GetScenePresence(key); |
6172 | 6172 | ||
6173 | if (av != null); | 6173 | if (av != null) |
6174 | { | 6174 | { |
6175 | foreach (object o in args.Data) | 6175 | foreach (object o in args.Data) |
6176 | { | 6176 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index b08a0fa..3dbd88c 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -331,7 +331,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
331 | m_host.AbsolutePosition, | 331 | m_host.AbsolutePosition, |
332 | m_host.Name, m_host.UUID); | 332 | m_host.Name, m_host.UUID); |
333 | } | 333 | } |
334 | catch (Exception f) | 334 | catch (Exception) |
335 | { | 335 | { |
336 | //} | 336 | //} |
337 | //else | 337 | //else |