Melanie 51bad0f8ae Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2011-11-06 20:12:57 +00:00

..

AssetService

Merge branch 'master' into bigmerge

2011-11-06 20:12:57 +00:00

AuthenticationService

Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

2011-10-25 03:26:09 +01: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

Get rid of AvatarAppearance.Owner to simplify the code.

2011-08-02 00:13:04 +01:00

Base

Formatting cleanup. Add copyright notices.

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

Connectors

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00: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

Merge branch 'master' into bigmerge

2011-10-12 16:45:48 +01:00

HypergridService

Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge

2011-10-25 02:15:06 +01:00

Interfaces

Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

2011-10-25 03:26:09 +01:00

InventoryService

Fix avatar parameter updating for viewer 3 and maybe 2.

2011-09-23 02:59:33 +01:00

LLLoginService

Merge branch 'master' into bigmerge

2011-11-05 11:17:40 +00:00

MapImageService

V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes

2011-06-13 09:13:44 -07:00

PresenceService

Delete existing presences for a user ID when they log in again.

2010-11-05 13:31:45 +00:00

UserAccountService

Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge

2011-10-25 02:55:57 +01:00