opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2013-02-08	1	-10/+98
\|\
\| *	Stop wrongly create a receiving store already populated with "Hello":"World" ↵	Justin Clark-Casey (justincc)	2013-02-08	1	-1/+3
\| \| \| \| \| \| \| \|	in TestJsonReadNotecard()
\| *	Extend TestJsonWriteNotecard() regression test for cases with fake paths and ↵	Justin Clark-Casey (justincc)	2013-02-08	1	-8/+61
\| \| \| \| \| \| \| \| \| \| \| \|	fake stores. Also separates out TestJsonWriteReadNotecard() into separate write and read tests
\| *	Extend TestJsonSetValue() regressio ntes tto test against a fake store	Justin Clark-Casey (justincc)	2013-02-08	1	-0/+5
\| \|
\| *	Extend TestJsonTestPath() regression test with checks against fake values ↵	Justin Clark-Casey (justincc)	2013-02-08	1	-0/+8
\| \| \| \| \| \| \| \|	and fake stores
\| *	Add tests for removing fake values/from fake store in TestJsonRemoveValue()	Justin Clark-Casey (justincc)	2013-02-07	1	-0/+11
\| \| \| \| \| \| \| \|	Again, need to check if returning true for removing a value that doesn't exist is most appropriate.
\| *	Add testing for getting non-existing values and values from a non-existing ↵	Justin Clark-Casey (justincc)	2013-02-07	1	-1/+10
\| \| \| \| \| \| \| \|	datastore to TestJsonGetValue()
* \|	Merge branch 'master' into careminster	Melanie	2013-02-07	1	-0/+20
\|\ \ \| \|/
\| *	Actually plumb the new values to physics.	Melanie	2013-02-07	1	-0/+20
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2013-02-07	3	-15/+29
\|\ \ \| \|/
\| *	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim	Melanie	2013-02-07	3	-15/+29
\| \|\
\| \| *	Add TestJsonDestoreStoreNotExists()	Justin Clark-Casey (justincc)	2013-02-07	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour.
\| \| *	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2013-02-07	30	-75/+1651
\| \| \|\
\| \| * \|	Fix a recent regression in e17392a where JsonSetValue() stopped working ↵	Justin Clark-Casey (justincc)	2013-02-07	3	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
\| * \| \|	Add some more code from Avination. This changes physics actor stuff around	Melanie	2013-02-07	3	-40/+165
\| \| \|/ \| \|/\| \| \| \| \| \| \|	to work with the new params. Not actually plumbed just yet.
\| * \|	Plumb the path from the client to the extra physics params and back	Melanie	2013-02-07	10	-7/+127
\| \| \|
\| * \|	Send the new physics params to the viewer build dialog	Melanie	2013-02-07	1	-0/+35
\| \| \|
\| * \|	Revert "Add plumbing for physics properties to get to the physics engine."	Melanie	2013-02-07	2	-55/+6
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
\| * \|	Add plumbing for physics properties to get to the physics engine.	Robert Adams	2013-02-07	2	-6/+55
\| \| \| \| \| \| \| \| \| \| \| \|	Addition of entries to PhysicsActor and setting code in SceneObjectPart.
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-07	8	-135/+220
\|\ \ \
\| * \| \|	Rename Bounciness to Restitution	Melanie	2013-02-07	6	-12/+12
\| \| \| \|
\| * \| \|	Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP	Melanie	2013-02-06	6	-116/+188
\| \| \| \|
\| * \| \|	Make scripts shout a error but not stop when button count is overrun on llDialog	Melanie	2013-02-05	1	-7/+9
\| \| \| \|
\| * \| \|	Merge branch 'teravuswork' into avination	Melanie	2013-01-31	1	-12/+23
\| \|\ \ \
\| \| * \| \|	* This Checks the asset of each wearable asynchronously and repairs if it's ↵	teravus	2013-01-29	1	-12/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	required.
\| * \| \| \|	* This adds a bit more to the previous flying roll effect by adding ↵	teravus	2013-01-31	1	-10/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
\| * \| \| \|	* Adds a satisfying angular roll when an avatar is flying and turning. ↵	Melanie	2013-01-31	2	-2/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
* \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	9	-44/+1376
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: bin/HttpServer_OpenSim.dll
\| * \| \| \|	Change passed PhysicsParameter value from float to the more general string value	Robert Adams	2013-02-07	4	-43/+57
\| \| \| \| \|
\| * \| \| \|	Websocket Echo module should not be on by default.	teravus	2013-02-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	* missing example module.. Oops.	teravus	2013-02-07	1	-0/+174
\| \| \| \| \|
\| * \| \| \|	* Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵	teravus	2013-02-07	120	-1141/+1466
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
\| \| * \| \| \|	Rename "Bounciness" to "Restitution"	Melanie	2013-02-07	4	-9/+9
\| \| \| \| \| \|
\| * \| \| \| \|	This is the final commit that enables the Websocket handler	teravus	2013-02-07	2	-2/+1095
\| \| \| \| \| \|
\| * \| \| \| \|	We're not really done here.. but we're getting there. Socket Read is ↵	teravus	2013-02-05	3	-4/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
\| * \| \| \| \|	Merge branch 'master' into JSONTCPClient	teravus	2013-02-03	6	-28/+54
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Adds the ability to load more then one IClientNetworkServer thereby allowing ↵	teravus	2013-02-03	4	-48/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	additional client stacks. Use comma separated values in clientstack_plugin in your config.
\| * \| \| \| \| \|	Commit 1 in of this branch feature. This is one of many...	teravus	2013-02-03	5	-0/+446
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Rename Bounciness to Restitution	Melanie	2013-02-07	6	-12/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	2	-2/+61
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2013-02-07	7	-15/+120
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Add TestJsonWriteReadNotecard() regression test	Justin Clark-Casey (justincc)	2013-02-07	2	-2/+45
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make json store tests operate on a single thread to ensure we don't run into ↵	Justin Clark-Casey (justincc)	2013-02-07	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	any race related test failures in the future.
* \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	10	-28/+151
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
\| * \| \| \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Mic Bowman	2013-02-06	6	-13/+43
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' of git://opensimulator.org/git/opensim	Dan Lake	2013-02-06	20	-429/+431
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	minor: add method doc to DAMap.ValidateKey()	Justin Clark-Casey (justincc)	2013-02-07	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Robert Adams	2013-02-06	1	-1/+2
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to ↵	Justin Clark-Casey (justincc)	2013-02-07	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	match Add(string key, OSDMap store)
\| \| \| * \| \| \| \| \|	BulletSim: set removing zero width triangles in meshes to be enabled by ↵	Robert Adams	2013-02-06	2	-1/+2
\| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default. This should fix the invisible barrier in sculptie doorways bug.