BlueWall 5b14941d0f Merge branch 'master' of /home/opensim/var/repo/opensim ... Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs		2012-08-06 10:10:54 -04:00
..
ApplicationPlugins	Merge branch 'master' of /home/opensim/var/repo/opensim	2012-06-12 21:37:11 -04:00
Capabilities	Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.	2012-07-13 01:03:28 +01:00
ConsoleClient	Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.	2012-07-11 22:54:22 +01:00
Data	Merge branch 'master' of /home/opensim/var/repo/opensim	2012-07-08 07:23:20 -04:00
Framework	Fix old regression that stopped saving parcel owner data in OARs.	2012-08-03 23:49:34 +01:00
Region	Merge branch 'master' of /home/opensim/var/repo/opensim	2012-08-06 10:10:54 -04:00
Server	Some formatting changes	2012-07-13 23:15:11 -04:00
Services	Merge branch 'master' of /home/opensim/var/repo/opensim	2012-08-02 23:03:17 -04:00
Tests	extend regression TestDetachScriptedAttachementToInventory() to check correct running status on a re-rezzed attachment	2012-07-24 22:33:54 +01:00
Tools	Fix a bug in pCampbot grabbing behaviour where an exception would be thrown if the bot was not yet aware of any objects.	2012-08-01 22:30:34 +01:00