Files
opensim/OpenSim/Framework/TaskInventoryItem.cs
Melanie dbc3f1ff92 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-02-02 01:53:13 +00:00

10 KiB