Melanie 556d70feef Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

2012-11-13 17:37:39 +00:00

..

Attachments

Merge branch 'master' into careminster

2012-10-31 21:42:06 +00:00

AvatarFactory

Merge branch 'master' into careminster

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

Chat

Merge branch 'master' into careminster

2012-11-13 17:37:39 +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

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08: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

Groups

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

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

InstantMessage

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Inventory

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Lure

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Profile

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

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