aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-04-30 12:06:58 +0100
committerMelanie2010-04-30 12:08:37 +0100
commit486ab82c027639c62e98ceb8850aaf385f9cef5f (patch)
tree4da87697ba5d1fd8a3431a7b81380689e5c7716d /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-486ab82c027639c62e98ceb8850aaf385f9cef5f.zip
opensim-SC_OLD-486ab82c027639c62e98ceb8850aaf385f9cef5f.tar.gz
opensim-SC_OLD-486ab82c027639c62e98ceb8850aaf385f9cef5f.tar.bz2
opensim-SC_OLD-486ab82c027639c62e98ceb8850aaf385f9cef5f.tar.xz
Fix some symbol errors
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f6bb3fe..69b247c 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1721,7 +1721,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1721 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1721 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1722 if (m_bypassPermissions) return m_bypassPermissionsValue; 1722 if (m_bypassPermissions) return m_bypassPermissionsValue;
1723 1723
1724 return GenericObjectPermission(editorID, objectID, false); 1724 return GenericObjectPermission(userID, objectID, false);
1725 } 1725 }
1726 1726
1727 private bool CanDelinkObject(UUID userID, UUID objectID) 1727 private bool CanDelinkObject(UUID userID, UUID objectID)
@@ -1729,7 +1729,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1729 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1729 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1730 if (m_bypassPermissions) return m_bypassPermissionsValue; 1730 if (m_bypassPermissions) return m_bypassPermissionsValue;
1731 1731
1732 return GenericObjectPermission(editorID, objectID, false); 1732 return GenericObjectPermission(userID, objectID, false);
1733 } 1733 }
1734 1734
1735 private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) 1735 private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene)