Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-01 07:44:43 +01:00
25 changed files with 404 additions and 83 deletions

View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;