Melanie ba203ed94f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-11-03 21:34:36 +00:00

..

Attachments

* Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't

2013-10-05 17:36:58 -05:00

AvatarFactory

Protect one more update of the baked texture hashes.

2013-05-24 13:25:25 -07:00

Chat

Merge branch 'master' into careminster

2013-10-06 18:32:20 +01:00

Combat

* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.

2013-08-24 05:55:53 -05:00

Commands

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00

Dialog

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

Friends

* Refactor

2013-10-07 23:19:50 -05:00

Gestures

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

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

Gods

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

InstantMessage

Merge branch 'master' into careminster

2013-07-29 02:08:05 +01:00

Inventory

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

Lure

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

Profile

Ensure selected module is the only active one

2013-06-07 20:09:10 -04:00

UserProfiles

Remove test that gives issue on Windows, just let the try/catch do the work.

2013-09-02 16:28:40 -04:00