diff options
author | Melanie | 2012-11-09 22:58:42 +0000 |
---|---|---|
committer | Melanie | 2012-11-09 22:58:42 +0000 |
commit | 415b89f434657fe4cbf62a5c99f24c2648a313ac (patch) | |
tree | 48d7e97cc64a4351755942745a9a8f65d52b5322 /OpenSim/Region/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | llSetLinkCamera implementation (diff) | |
download | opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.zip opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.gz opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.bz2 opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs index 2bb0c75..aacc26b 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs | |||
@@ -24,6 +24,7 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | using System; | ||
27 | 28 | ||
28 | using Nini.Config; | 29 | using Nini.Config; |
29 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
@@ -33,6 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
33 | /// <summary> | 34 | /// <summary> |
34 | /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead | 35 | /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead |
35 | /// </summary> | 36 | /// </summary> |
37 | [Obsolete("Use INonSharedRegionModule or ISharedRegionModule instead", false)] | ||
36 | public interface IRegionModule | 38 | public interface IRegionModule |
37 | { | 39 | { |
38 | /// <summary> | 40 | /// <summary> |