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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-09-24 20:14:00 +01:00

..

Asset

Minor: may avoid crashes of sims that still don't have this configuration section.

2012-09-21 15:04:41 -07:00

Authentication

fix vs2010 build

2012-08-16 15:26:16 +01:00

Authorization

minor: resolve some mono compiler warnings

2012-05-03 01:56:24 +01:00

Avatar

Major refactoring of appearance handling.

2010-10-20 16:17:54 -07:00

Grid

Correctly override and call base OpenSimTestCase.SetUp() method in GridConnectorsTests and ArchiverTests.

2012-09-19 01:06:42 +01:00

GridUser

OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id

2012-06-12 02:43:33 +01:00

Inventory

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

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

Land

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

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

MapImage

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00

Neighbour

Don't cache regions data on the other unused LocalGridServiceConnector that the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector.

2012-07-13 00:44:00 +01:00

Presence

OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id

2012-06-12 02:43:33 +01:00

Simulation

Merge branch 'master' into careminster

2012-08-23 01:41:47 +01:00

UserAccounts

Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge

2011-10-11 21:29:04 +01:00