Robert Adams 1cf17a3cf7 Merge branch 'master' into varregion ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneBase.cs
	OpenSim/Services/Interfaces/IGridService.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)

2014-01-11 08:52:23 -08:00

..

BuySell

Merge branch 'master' into varregion

2014-01-11 08:52:23 -08:00

Commands

Show texture ids for full object/part info console commmds

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