Dan Lake 681190f682 Merge branch 'master' into danmerge ... Conflicts: .nant/local.include OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/IClientAPI.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs bin/config-include/SimianGrid.ini prebuild.xml		2010-11-30 17:36:36 -08:00
..
Compiler	minor: remove some mono compiler warnings	2009-11-24 17:32:14 +00:00
Configger	Configuration files can read include files from relative paths.	2010-08-13 23:59:30 +01:00
LaunchSLClient	Switch runprebuild.bat from VS2005 to VS2008. Remove runprebuild2008.bat.	2009-07-10 04:29:00 +00:00
OpenSim.32BitLaunch	Added missing files to git	2010-09-27 16:00:29 -07:00
Robust.32BitLaunch	Fixed Robust.32BitLaunch.exe	2010-06-27 13:06:39 -07:00
pCampBot	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
classaudit.pl	Updated paths in classaudit script.	2008-02-25 11:53:21 +00:00