Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-11-09 22:58:42 +00:00
13 changed files with 300 additions and 62 deletions

View File

@@ -24,6 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using Nini.Config;
using OpenSim.Region.Framework.Scenes;
@@ -33,6 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <summary>
/// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
/// </summary>
[Obsolete("Use INonSharedRegionModule or ISharedRegionModule instead", false)]
public interface IRegionModule
{
/// <summary>