Melanie 4ccb15290e Merge branch 'master' into careminster ...

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

2014-01-28 20:47:36 +00:00

..

BuySell

Merge branch 'master' into careminster

2014-01-28 20:47:36 +00:00

Commands

Show texture ids for full object/part info console commmds

2013-10-24 21:29:57 +01:00