Melanie 2f365ea80b Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs		2013-09-07 13:54:19 +01:00
..
SimianActivityDetector.cs	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
SimianAssetServiceConnector.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianAuthenticationServiceConnector.cs	Merge branch 'master' into careminster	2013-08-01 01:23:24 +01:00
SimianAvatarServiceConnector.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianExternalCapsModule.cs	minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGrid	2013-08-17 01:06:48 +01:00
SimianFriendsServiceConnector.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianGrid.cs	minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGrid	2013-08-17 01:06:48 +01:00
SimianGridMaptileModule.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianGridServiceConnector.cs	Merge branch 'master' into careminster	2013-09-07 13:54:19 +01:00
SimianInventoryServiceConnector.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianPresenceServiceConnector.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianProfiles.cs	A pretty major restructuring of the simian method invocations in order to	2013-07-31 11:27:35 -07:00
SimianUserAccountServiceConnector.cs	Merge branch 'master' into careminster	2013-08-01 01:23:24 +01:00