Melanie 4cbf8d728e Fix merge

2012-01-14 05:39:56 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-01-06 22:41:26 +00:00

Capabilities

Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.

2012-01-06 21:07:34 +00:00

ConsoleClient

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Data

Spin off terrain save into a new thread and make it so that it uses the old

2011-12-13 12:58:28 +01:00

Framework

Merge branch 'master' into careminster

2012-01-13 02:27:20 +00:00

Region

Fix merge

2012-01-14 05:39:56 +01:00

Server

Merge branch 'master' into careminster

2012-01-06 00:08:18 +00:00

Services

HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.

2012-01-12 09:56:35 -08:00

Tests

Implement handler for TeleportCancel inbound packet

2011-12-10 15:17:34 +00:00

Tools

minor: add missing newlines to pCampbot usage statement

2012-01-03 15:42:36 +00:00