Melanie 68b910c1ff Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

2013-03-22 01:01:24 +00:00

..

Attachments

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

AvatarFactory

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

Chat

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

Combat

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Commands

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00

Dialog

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

Friends

Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests

2012-11-24 03:15:24 +00:00

Gestures

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Gods

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

InstantMessage

Merge branch 'master' into careminster

2012-12-07 03:49:04 +00:00

Inventory

Merge branch 'master' into careminster

2013-02-16 05:37:12 +00:00

Lure

Merge branch 'master' into careminster

2013-02-28 21:20:07 +00:00

Profile

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00