UbitUmarov 7cb3d583a9 merge conflits

2016-11-19 15:45:41 +00:00

..

AssetService

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

AuthenticationService

Fix the previous commit

2016-11-19 02:28:31 +00:00

AuthorizationService

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

AvatarService

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

Base

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

Connectors

fix some invalid string.format arguments

2016-11-09 22:39:52 +00:00

EstateService

Donation of robust network connectors for estate service, as promised. This allows to have one central database for estates without having to open the MySql port. This is off by default, so not to disturb everyone's existing installations. To use it, see GridCommon.ini.example [EstateDataStore] section and Robust*.ini.example's new additions.

2015-01-06 21:24:44 -08:00

FreeswitchService

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

Friends

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

FSAssetService

Introduce UseOsgridFormat config to select the OSGrid specific path name

2016-03-05 01:26:28 +01:00

GridService

stop a spamming robust debug message

2016-08-02 17:37:41 +01:00

HypergridService

merge issue

2016-08-19 03:05:25 +01:00

Interfaces

add GetUsersNames(string[] ids) to UserManagement. Make GetDisplayNames cap use it so several IDs are handle on a single call. Since there is no grid side suport, no much gain still

2016-08-17 06:00:42 +01:00

InventoryService

Finally remove the requirement for an InventoryItem/FolderBase object to

2016-07-04 03:35:48 +01:00

LLLoginService

make login to default regions be flaged also as login via RegionID, so landpoints can work on those default regions

2016-09-15 01:56:38 +01:00

MapImageService

Fix a couple of typos

2016-03-05 22:22:09 +01:00

PresenceService

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

SimulationService

add load baked terrain methods

2016-09-17 16:42:40 +01:00

UserAccountService

partially apply patch in mantis 8002

2016-08-21 03:06:31 +01:00

UserProfilesService

seems to compile ( tests comented out)

2015-09-02 19:54:53 +01:00