Melanie 13cd8c17d7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs

2013-05-11 02:35:26 +01:00

..

AssetService

Merge branch 'master' into careminster

2013-03-15 23:45:32 +00:00

AuthenticationService

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00

AuthorizationService

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

AvatarService

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Base

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Connectors

Merge branch 'master' into careminster

2013-04-10 13:20:55 +01:00

FreeswitchService

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Friends

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

GridService

Switched to using the other Util function with a default value.

2013-02-27 20:59:16 -08:00

HypergridService

Merge branch 'master' into careminster

2013-04-29 00:38:20 +01:00

Interfaces

Merge branch 'master' into careminster

2013-04-29 00:38:20 +01:00

InventoryService

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

LLLoginService

Merge branch 'master' into careminster

2013-05-11 02:35:26 +01:00

MapImageService

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

PresenceService

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

UserAccountService

Merge branch 'master' into careminster

2013-04-29 00:38:20 +01:00