aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-25 04:03:16 +0100
committerJustin Clark-Casey (justincc)2012-05-25 04:03:16 +0100
commit67ebe80dd95ffa2c5e9b071497b472f9c99f00f8 (patch)
treeb4615b8efb28ea1b038323c19859ccd31e0e6435 /OpenSim/Region/CoreModules/Framework/EntityTransfer
parenton agent cross, remove from physics scene after its been placed in transit, n... (diff)
downloadopensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.zip
opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.gz
opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.bz2
opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.xz
Resolve some mono compiler warnings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index a5fb0c2..ae9fb53 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1240,7 +1240,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1240 1240
1241 return agent; 1241 return agent;
1242 } 1242 }
1243 1243
1244 private void CrossAgentToNewRegionCompleted(IAsyncResult iar) 1244 private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
1245 { 1245 {
1246 CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState; 1246 CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 4124667..0fdd457 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -336,7 +336,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
336 336
337 // Let's find out if this is a foreign user or a local user 337 // Let's find out if this is a foreign user or a local user
338 IUserManagement uMan = m_scene.RequestModuleInterface<IUserManagement>(); 338 IUserManagement uMan = m_scene.RequestModuleInterface<IUserManagement>();
339 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, obj.AgentId); 339// UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, obj.AgentId);
340 if (uMan != null && uMan.IsLocalGridUser(obj.AgentId)) 340 if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
341 { 341 {
342 // local grid user 342 // local grid user