Robert Adams 6937eec258 Merge branch 'master' into varregion ...

Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2013-12-17 06:18:13 -08:00

..

Agent

Made terrain uploads thread-safe

2013-10-15 00:12:56 +01:00

Asset

Committing the Avination Scene Presence and related texture code

2013-12-11 01:39:56 +00:00

Avatar

Merge branch 'master' into varregion

2013-12-17 06:18:13 -08:00

Framework

Merge branch 'master' into varregion

2013-12-17 06:18:13 -08:00

Hypergrid

minor: Correct minor spelling mistake Reseting -> Resetting in HG Map module log message

2013-09-20 23:42:55 +01:00

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

Scripting

varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.

2013-12-14 07:53:01 -08:00

ServiceConnectorsIn

Add support for user preferences (im via email)

2013-12-06 02:52:13 -05:00

ServiceConnectorsOut

varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.

2013-12-14 07:53:01 -08:00

World

Merge branch 'master' into varregion

2013-12-17 06:18:13 -08:00