opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	0	-0/+0
\|\ \ \ \| \|/ /
\| * \|	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
\| \| \|
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-07	9	-136/+222
\|\ \ \
\| * \| \|	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	7	-117/+190
\| \| \| \|
\| * \| \|	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.
* \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	0	-0/+0
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	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 'master' into careminster	Melanie	2013-02-07	12	-2945/+4280
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	128	-1214/+1475
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
\| * \| \| \| \|	This is the final commit that enables the Websocket handler	teravus	2013-02-07	4	-2/+1095
\| \| \| \| \| \|
\| * \| \| \| \|	We're not really done here.. but we're getting there. Socket Read is ↵	teravus	2013-02-05	6	-2905/+2946
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
\| * \| \| \| \|	Merge branch 'master' into JSONTCPClient	teravus	2013-02-03	8	-31/+72
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Changing OpenSimDefaults back to default	teravus	2013-02-03	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Adds the ability to load more then one IClientNetworkServer thereby allowing ↵	teravus	2013-02-03	5	-49/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-0/+491
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Rename Bounciness to Restitution	Melanie	2013-02-07	6	-12/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	0	-0/+0
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Rename "Bounciness" to "Restitution"	Melanie	2013-02-07	4	-9/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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	23	-429/+435
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	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.
\| \| \| * \| \| \| \|	BulletSim: check for completely degenerate meshes (ones with all	Robert Adams	2013-02-06	1	-9/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	triangles having zero width) and output an error rather than throwing and exception.
\| \| * \| \| \| \| \|	WebStats will now use actual logfile as specified in OpenSim.exe.config ↵	Dan Lake	2013-02-06	2	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
\| * \| \| \| \| \| \|	Enables script access to the per object dynamic attributes through the JsonStore	Mic Bowman	2013-02-06	5	-13/+104
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default.
\| * \| \| \| \| \|	BulletSim: remove an exception which occurs if a physics mesh	Robert Adams	2013-02-06	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	asset is not found.
* \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-07	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Fix a bug I brought in by manually editing a diff file. Terrain is if cource ↵	Melanie	2013-02-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not always at 20m.
\| * \| \| \| \| \|	Partial port of Avination's support for the new physics parameters.	Melanie	2013-02-06	7	-21/+264
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-06	8	-147/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	minor: Add explanation of MaptileStaticUUID setting in Regions.ini.example	Justin Clark-Casey (justincc)	2013-02-06	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove long unused Scene.DumpAssetsToFile boolean.	Justin Clark-Casey (justincc)	2013-02-06	4	-9/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove very long unused IScriptHost and NullScriptHost	Justin Clark-Casey (justincc)	2013-02-06	3	-138/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-06	24	-462/+373
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
\| * \| \| \| \| \|	Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵	Justin Clark-Casey (justincc)	2013-02-06	3	-168/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused.