Melanie 64393a7ca8 Merge branch 'master' into careminster ...

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

2012-07-13 02:27:16 +01:00

..

Asset

Resolve some mono compiler warnings.

2012-05-25 04:03:16 +01:00

Authentication

Add optional getauthinfo and setauthinfo authentication service calls.

2011-10-24 21:40:36 +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

Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578

2012-07-13 01:08:49 +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

Finish the implementation of GetUserInventory, even though it's still not used.

2012-04-06 11:38:47 -07: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-04-27 22:28:09 +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-07-01 03:04:23 +01:00

UserAccounts

Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge

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