Tom 66dec3b874 Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

..

Asset

WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.

2010-11-25 11:14:16 -08:00

Authentication

Fixed small inconsistency in config var name.

2010-01-10 17:19:40 -08:00

Authorization

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

Avatar

Applied fix for avatar connectors similar to yesterday's fix of user account connectors.

2010-01-03 07:03:14 -08:00

Base

Fix loading modules with alternate configurations and ports into ROBUST.

2009-09-29 09:44:12 +01:00

Freeswitch

Implement a method to allow regions to query the gridwide Freeswitch

2010-11-21 22:17:25 +00:00

Friends

HG Friends bug fix: connector was shrinking principalID to UUID.

2011-06-02 07:26:40 -07:00

Grid

The get_grid_info REST call now encodes XML Entities

2011-05-14 00:31:54 +01:00

GridUser

Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior

2010-09-29 14:34:02 -07:00

Hypergrid

This hopefully fixes all issues with online/offline notifications across grids. http://opensimulator.org/mantis/view.php?id=5528

2011-06-07 19:36:04 -07:00

Inventory

remove some mono compiler warnings and unnecessary dictionary instantiations

2011-01-21 22:51:52 +00:00

Land

Implement Scope ID lookup on GetLandData. Stacked regions were not handled

2011-01-03 19:40:55 +00:00

Login

LLLoginHandlers now supports both password & web login

2011-03-26 02:28:11 +00:00

Map

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

Neighbour

Merge branch 'diva-textures-osgrid'

2009-10-04 05:49:16 +01:00

Presence

remove some mono compiler warnings and unnecessary dictionary instantiations

2011-01-21 22:51:52 +00:00

Simulation

Merge branch 'master' into careminster-presence-refactor

2011-05-13 12:05:46 +01:00

UserAccounts

* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.

2010-04-03 12:03:34 -07:00