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

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

AssetService

Merge branch 'master' into careminster

2013-06-30 18:27:30 +01: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-08-17 03:23:45 +01:00

FreeswitchService

Deleted all AssemblyFileVersion directives

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

Friends

Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."

2013-07-04 09:17:01 -07: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-07-24 04:45:07 +01:00

Interfaces

Merge branch 'master' into careminster

2013-07-18 10:08:10 +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-06-23 01:59:57 +01:00

MapImageService

Force map tiler to save Water.jpg as an actual jpeg format it seems even though we specified jpg extention it was actually a png and thus confusing the viewer silently.

2013-07-26 14:11:42 -04:00

PresenceService

Deleted all AssemblyFileVersion directives

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

UserAccountService

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

UserProfilesService

Adding standard OpenSim header to source files

2013-05-31 22:03:27 -04:00