Melanie 7dad1ded2e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2012-03-29 00:27:35 +01:00

..

Interfaces

Add "friends show cache <first-name> <last-name>" command for debugging purposes.

2012-03-28 02:51:34 +01:00

Scenes

Merge branch 'master' into careminster

2012-03-29 00:27:35 +01:00

ModuleLoader.cs

Merge branch 'master' into careminster-presence-refactor

2011-04-12 00:27:39 +01:00