Robert Adams f212a60067 Merge branch 'dev_kitty' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into physbucket ... Conflicts: OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs		2011-02-24 14:48:11 -08:00
..
ApplicationPlugins	Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.	2011-02-12 01:08:56 +00:00
Client	Merge branch 'master' of git://opensimulator.org/git/opensim into dev	2011-01-24 20:03:20 -08:00
ConsoleClient	Make the text mode remote console really work. It can now be used to send	2010-06-08 22:05:06 +01:00
Data	Merge branch 'master' into dev	2011-02-14 13:39:27 -08:00
Framework	Merge branch 'master' into dev	2011-02-14 13:39:27 -08:00
Region	Merge branch 'dev_kitty' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into physbucket	2011-02-24 14:48:11 -08:00
Server	Comment previous debug	2011-02-08 11:16:38 -08:00
Services	Merge branch 'master' into dev	2011-02-14 13:39:27 -08:00
TestSuite	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
Tests	Merge branch 'master' from git://opensimulator.org/git/opensim into dev	2011-01-30 04:13:20 -08:00
Tools	Merge branch 'master' into danmerge	2010-11-30 17:36:36 -08:00