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

Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

2012-10-31 21:42:06 +00:00

..

BuySell

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

Commands

Make "show object part" command correctly display script status.

2012-10-31 00:31:18 +00:00