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

..

Asset

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

Authentication

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

Authorization

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

Avatar

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

Base

Move PluginManager

2012-10-19 07:38:36 -04:00

Freeswitch

Implement a method to allow regions to query the gridwide Freeswitch

2010-11-21 22:17:25 +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

Grid

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

GridUser

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

Hypergrid

Remove some mono compiler warnings from OpenSim/Server/Handlers

2013-08-17 01:08:19 +01:00

Inventory

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

Land

Implement Scope ID lookup on GetLandData. Stacked regions were not handled

2011-01-03 19:40:55 +00:00

Login

Fixed mantis #6609 -- LoadPlugin error messages on Robust.

2013-05-13 13:07:39 -07:00

Map

Merge branch 'master' into careminster

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

Neighbour

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

Presence

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

Profiles

Remove some mono compiler warnings from OpenSim/Server/Handlers

2013-08-17 01:08:19 +01:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Simulation

Merge branch 'master' into careminster

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

UserAccounts

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