Huaiyu (Kitty) Liu 04ef2366c2 Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs		2011-03-15 11:26:46 -07: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' of git://opensimulator.org/git/opensim into dev	2011-03-07 15:57:31 -08:00
Framework	Merge branch 'master' of git://opensimulator.org/git/opensim into dev	2011-03-07 16:03:50 -08:00
Region	Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev	2011-03-15 11:26:46 -07:00
Server	On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows	2011-02-24 00:55:50 +00:00
Services	Merge branch 'master' of git://opensimulator.org/git/opensim into dev	2011-03-07 15:57:31 -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' of git://opensimulator.org/git/opensim into dev	2011-03-07 15:57:31 -08:00
Tools	Merge branch 'master' into danmerge	2010-11-30 17:36:36 -08:00