Melanie 710381e838 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs

2013-03-13 02:02:46 +00:00

..

BunchOfCaps

Merge branch 'avination' into careminster

2013-03-03 13:24:37 +00:00

EventQueue

Merge branch 'master' into careminster

2013-03-13 02:02:46 +00:00

ObjectCaps

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

FetchInventory2Module.cs

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

GetMeshModule.cs

try to patch getmesh Throttle (test)

2013-01-13 15:25:51 +00:00

GetTextureModule.cs

Prevent a failed user relogi from throwing exceptions in poll services

2012-12-14 03:35:55 +01:00

MeshUploadFlagModule.cs

Merge branch 'master' into careminster

2013-03-05 23:57:53 +00:00

RegionConsoleModule.cs

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00

SimulatorFeaturesModule.cs

Add an event and some logic to allow customizing Simulator Features by avatar

2013-02-14 09:11:57 +00:00

UploadBakedTextureModule.cs

* Handle a NRE with Baked Textures that may result in a failed appearance. This may be an issue, or it may be a symptom.

2013-01-22 18:49:50 -05:00

WebFetchInvDescModule.cs

Make a viewer sent XML error prettier

2013-03-03 11:40:46 +01:00