Melanie 31ab8b2fe0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-05-05 10:32:04 +01:00

..

AssetService

Merge branch 'master' into careminster

2012-03-27 18:11:05 +01:00

AuthenticationService

OpenID auth needs hashing before authenticating

2012-03-02 15:05:06 -05:00

AuthorizationService

Pass the first name and last name from the agent circuit data to the authorization service rather than from the account.

2011-07-23 03:48:53 +01:00

AvatarService

Comment out AvatarService.SetAvatar debug log line for now

2012-04-25 01:09:23 +01:00

Base

Formatting cleanup. Add copyright notices.

2010-03-10 13:15:36 +09:00

Connectors

Merge branch 'master' into careminster

2012-04-20 16:48:43 +01:00

FreeswitchService

minor: remove mono compiler warning

2011-05-27 23:43:31 +01:00

Friends

More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.

2011-05-22 16:51:03 -07:00

GridService

Replace HG linker with core version

2012-03-27 01:46:02 +01:00

HypergridService

Merge branch 'master' into careminster

2012-04-08 02:25:48 +01:00

Interfaces

Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?

2012-04-26 16:17:46 +01:00

InventoryService

refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance

2012-05-04 20:37:21 +01:00

LLLoginService

Merge branch 'master' into careminster

2012-05-05 10:32:04 +01:00

MapImageService

Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)

2011-11-19 00:29:52 +00:00

PresenceService

Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.

2012-03-30 00:42:55 +01:00

UserAccountService

Merge branch 'master' into careminster

2012-03-20 02:48:11 +00:00