Melanie 5776351f6a Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-07-05 22:17:39 +01:00

..

AssetService

Merge branch 'master' into careminster

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

AuthenticationService

Fix impersonation, it got broken in a merge

2012-06-01 23:04:13 +02: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-06-12 03:09:52 +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

Show region positions in "show regions" robust console command

2012-06-26 23:05:10 +01:00

HypergridService

Merge branch 'master' into careminster

2012-07-01 03:04:23 +01:00

Interfaces

Merge branch 'master' into careminster

2012-07-01 03:04:23 +01:00

InventoryService

Fix various issues with http inventory

2012-06-02 04:57:10 +01:00

LLLoginService

Merge branch 'master' into careminster

2012-07-05 22:17:39 +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