Melanie bef03fb30b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

Attachments

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

AvatarFactory

Protect one more update of the baked texture hashes.

2013-05-24 13:25:25 -07:00

Chat

Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.

2013-03-22 01:43:18 +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

Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap

2013-07-08 22:03:07 +01: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

2013-07-18 10:08:10 +01:00

InstantMessage

Merge branch 'master' into careminster

2013-07-29 02:08:05 +01:00

Inventory

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

Lure

Merge branch 'master' into careminster

2013-03-28 02:29:07 +00:00

Profile

Ensure selected module is the only active one

2013-06-07 20:09:10 -04:00

UserProfiles

Remove mono compiler warnings from UserProfilesModule

2013-08-17 01:10:58 +01:00