aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-22 20:04:12 +0300
committerOren Hurvitz2014-04-23 16:37:36 +0300
commit998d7009a65def0a4debc9369d35b63611db5b55 (patch)
treed1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/CoreModules/Framework
parentWorkaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff)
downloadopensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz
Eliminated many warnings
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs2
3 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index d4b2f2d..539367d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1540,8 +1540,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1540 1540
1541 public bool Cross(ScenePresence agent, bool isFlying) 1541 public bool Cross(ScenePresence agent, bool isFlying)
1542 { 1542 {
1543 uint x;
1544 uint y;
1545 Vector3 newpos; 1543 Vector3 newpos;
1546 string version; 1544 string version;
1547 string failureReason; 1545 string failureReason;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 0becfb2..a3cebe9 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -426,7 +426,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
426 // return base.UpdateAgent(reg, finalDestination, agentData, sp); 426 // return base.UpdateAgent(reg, finalDestination, agentData, sp);
427 //} 427 //}
428 428
429 public virtual void TriggerTeleportHome(UUID id, IClientAPI client) 429 public override void TriggerTeleportHome(UUID id, IClientAPI client)
430 { 430 {
431 TeleportHome(id, client); 431 TeleportHome(id, client);
432 } 432 }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 3455e2c..6a997b3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -686,8 +686,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
686 if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId)) 686 if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId))
687 return; 687 return;
688 688
689 string[] names;
690
691 UserData ud; 689 UserData ud;
692 690
693 lock (m_UserCache) 691 lock (m_UserCache)