Merge branch 'master' into careminster

author: Melanie 2010-01-26 14:53:14 +0000
committer: Melanie 2010-01-26 14:53:14 +0000
commit: b80ea002654bd0ab232aee2b0f842be18b8d4edc (patch)
tree: 35971637efd7ec9cbfaee88bc5ea56edffddfc1b /OpenSim/Region/Framework/Interfaces/IEstateModule.cs
parent: Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent: Replace dome tabs with spaces (diff)
download: opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.zip
opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.gz
opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.bz2
opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 890fa31..347818c 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IEstateModule : IRegionModule
+    public interface IEstateModule : INonSharedRegionModule
    {
        uint GetRegionFlags();
        bool IsManager(UUID avatarID);
author	Melanie	2010-01-26 14:53:14 +0000
committer	Melanie	2010-01-26 14:53:14 +0000
commit	b80ea002654bd0ab232aee2b0f842be18b8d4edc (patch)
tree	35971637efd7ec9cbfaee88bc5ea56edffddfc1b /OpenSim/Region/Framework/Interfaces/IEstateModule.cs
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	Replace dome tabs with spaces (diff)
download	opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.zip opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.gz opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.bz2 opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.xz

diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs index 890fa31..347818c 100644 --- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
29		29
30	namespace OpenSim.Region.Framework.Interfaces	30	namespace OpenSim.Region.Framework.Interfaces
31	{	31	{
32	public interface IEstateModule : IRegionModule	32	public interface IEstateModule : INonSharedRegionModule
33	{	33	{
34	uint GetRegionFlags();	34	uint GetRegionFlags();
35	bool IsManager(UUID avatarID);	35	bool IsManager(UUID avatarID);