aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-01-09 15:15:41 +0000
committerMelanie Thielker2009-01-09 15:15:41 +0000
commit993b965f0af440aaa8395acf1b2b312e1b95166e (patch)
treed4de518954271821d3e1c043d3eccff41556add9 /OpenSim
parentFinish dwell sending, adding the forgotten method body. (diff)
downloadopensim-SC_OLD-993b965f0af440aaa8395acf1b2b312e1b95166e.zip
opensim-SC_OLD-993b965f0af440aaa8395acf1b2b312e1b95166e.tar.gz
opensim-SC_OLD-993b965f0af440aaa8395acf1b2b312e1b95166e.tar.bz2
opensim-SC_OLD-993b965f0af440aaa8395acf1b2b312e1b95166e.tar.xz
Prevent error message from scripted IM
Fixes Mantis #2970
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 96e7919..f765cfe 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -845,6 +845,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
845 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 845 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
846 if (m_bypassPermissions) return m_bypassPermissionsValue; 846 if (m_bypassPermissions) return m_bypassPermissionsValue;
847 847
848 // If the sender is an object, check owner instead
849 //
850 SceneObjectPart part = startScene.GetSceneObjectPart(user);
851 if (part != null)
852 user = part.OwnerID;
853
848 return GenericCommunicationPermission(user, target); 854 return GenericCommunicationPermission(user, target);
849 } 855 }
850 856