Glenn Martin 91a55c0794 Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2 ...

Fixed conflicts.

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

2015-05-19 14:07:44 -04:00

..

Application

Actually start a region created via the "create region" console command.

2015-03-13 23:50:00 +00:00

ClientStack

revised GetMesh to not use intermediate base64 coding scheme

2015-03-05 18:15:42 -05:00

CoreModules

Change UserProfiles so that the parcel name is used for a ProfilePick and not the parcel owners name. This change also fixes a bug where if the avatar enters and does not move, creating or editing a ProfilePick would set the parcelId as an empty UUID. This is because ScenePresence.currentParcelUUID is not set until the avatar moves.

2015-04-12 15:36:22 -04:00

DataSnapshot

Prevent null entries being treated as URI's when DataSnapshot service splits service string. The new config format for services to notify in the DataSnapshot module appends entries to the existing single string and always leaves a deliminator on the end of the string. This is causing it to split with a null string in the resulting array, which is treated as another service to notify and throws a URI format exception on start up.

2015-02-01 10:29:47 -08:00

Framework

Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2

2015-05-19 14:07:44 -04:00

OptionalModules

Avoid deadlock in NPCModule between DeleteNPC and GetNPC on m_avatars

2015-04-18 08:08:33 -05:00

Physics

BulletSim: implement VEHICLE_REFERENCE_FRAME. Thanks Vegaslon!.

2015-04-05 20:20:37 -07:00

RegionCombinerModule

Fixed declaration switcharoo on the region combiner dll.

2014-12-31 08:20:17 -08:00

ReplaceableModules

…

ScriptEngine

Moved over metrics from previous OpenSim 0.8.0.3 repository (this new repository is now the master branch from OpenSim).

2015-04-21 14:29:17 -04:00

UserStatistics

Renamed VERSION_NUMBER to VersionNumber

2014-12-30 15:27:28 -08:00