diff options
author | Teravus Ovares | 2008-05-17 00:16:16 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-17 00:16:16 +0000 |
commit | 349a17f664f661acf97896d4b778368edb822044 (patch) | |
tree | 24893ef56a12a7e758503c79cddcae3263ee2dbc /OpenSim/Region/Environment/Modules | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-349a17f664f661acf97896d4b778368edb822044.zip opensim-SC-349a17f664f661acf97896d4b778368edb822044.tar.gz opensim-SC-349a17f664f661acf97896d4b778368edb822044.tar.bz2 opensim-SC-349a17f664f661acf97896d4b778368edb822044.tar.xz |
* Tweaked patch mantis 1302 and committing it.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index f37e12a..815a505 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -331,6 +331,21 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
331 | set { } | 331 | set { } |
332 | } | 332 | } |
333 | 333 | ||
334 | public LLUUID ActiveGroupId | ||
335 | { | ||
336 | get { return LLUUID.Zero; } | ||
337 | } | ||
338 | |||
339 | public string ActiveGroupName | ||
340 | { | ||
341 | get { return String.Empty; } | ||
342 | } | ||
343 | |||
344 | public ulong ActiveGroupPowers | ||
345 | { | ||
346 | get { return 0; } | ||
347 | } | ||
348 | |||
334 | public virtual int NextAnimationSequenceNumber | 349 | public virtual int NextAnimationSequenceNumber |
335 | { | 350 | { |
336 | get { return 1; } | 351 | get { return 1; } |
@@ -743,4 +758,4 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
743 | } | 758 | } |
744 | #endregion | 759 | #endregion |
745 | } | 760 | } |
746 | } \ No newline at end of file | 761 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 43e8f36..a319119 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -882,7 +882,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
882 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 882 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
883 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 883 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
884 | 884 | ||
885 | return true; | 885 | return false; |
886 | } | 886 | } |
887 | 887 | ||
888 | private bool CanViewNotecard(LLUUID notecard, LLUUID objectID, LLUUID user, Scene scene) | 888 | private bool CanViewNotecard(LLUUID notecard, LLUUID objectID, LLUUID user, Scene scene) |
@@ -890,7 +890,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
890 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 890 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
891 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 891 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
892 | 892 | ||
893 | return true; | 893 | return false; |
894 | } | 894 | } |
895 | 895 | ||
896 | #endregion | 896 | #endregion |