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

Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs

2012-01-02 21:41:36 +00:00

..

Tests

Add test for removing a friendship.

2011-11-14 20:56:56 +00:00

FriendsModule.cs

Merge branch 'master' into bigmerge

2011-11-17 19:04:27 +00:00

FriendsRequestHandler.cs

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

HGFriendsModule.cs

Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.

2011-12-29 16:12:06 -08:00