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-03-11	1	-0/+17
\|\
\| *	* Apparently, sometimes texture entries come in from the wire with no ↵	teravus	2013-03-08	1	-0/+17
\| \| \| \| \| \| \| \|	default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
* \|	Merge branch 'master' into careminster	Melanie	2013-03-08	4	-122/+189
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
\| *	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2013-03-06	1	-1/+13
\| \|\
\| \| *	Per discussions with justincc... split the JsonStore type	Mic Bowman	2013-03-05	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	functions into one for node type and one for value type. Define and export constants for both nodes and values.
\| * \|	Add code for testing event queue messages recevied on region cross.	Justin Clark-Casey (justincc)	2013-03-06	1	-5/+22
\| \| \| \| \| \| \| \| \| \| \| \|	This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
\| * \|	Add regression test for presence crossing between regions on the same simulator.	Justin Clark-Casey (justincc)	2013-03-06	3	-121/+159
\| \|/ \| \| \| \| \| \|	Unlike a much earlier commented out version of this test, this is done in synchronous mode.
* \|	* Separate two if trees that got merged into one if tree with borked logic.	teravus	2013-03-06	1	-2/+25
\| \|
* \|	Merge branch 'avination' into careminster	Melanie	2013-03-06	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
\| * \|	Multiattach, part 1	Melanie	2013-03-05	2	-2/+2
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-03-05	1	-2/+10
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
\| * \|	Move AllowedClients and BannedClients section to new [AccessControl] section ↵	Justin Clark-Casey (justincc)	2013-03-02	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in OpenSim.ini from [Startup] This change also corrects the setting names - they were actually wrong (though the text in {} was correct). If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-03-03	3	-21/+43
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
\| * \|	Make Keyframe motion cross regions again	Melanie	2013-03-03	2	-2/+4
\| \| \|
\| * \|	Fix an issue where the viewer would request the seed cap before	Melanie	2013-02-18	2	-19/+39
\| \| \| \| \| \| \| \| \| \| \| \|	there was a handler for it.
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-28	2	-18/+13
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
\| * \|	Add regression tests for llGetNotecardLine()	Justin Clark-Casey (justincc)	2013-02-28	1	-2/+2
\| \| \|
\| * \|	Get "show modules" console command to obey selected command line region/s	Justin Clark-Casey (justincc)	2013-02-27	1	-16/+11
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-27	1	-0/+11
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
\| * \|	Add regression test for llRequestUrl()	Justin Clark-Casey (justincc)	2013-02-26	1	-0/+11
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-26	1	-2/+9
\|\ \ \ \| \|/ /
\| * \|	Move map related settings from [Startup] to a new [Map] section in OpenSim.ini	Justin Clark-Casey (justincc)	2013-02-25	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-23	1	-0/+6
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
\| * \|	minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵	Justin Clark-Casey (justincc)	2013-02-22	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	set only for region crossing and not teleport, etc.
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-22	3	-3/+6
\|\ \ \ \| \|/ /
\| * \|	Fix the JsonStore path set problem justincc found earlier today and	Mic Bowman	2013-02-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	remove the deprecated TestPath functions.
\| * \|	Deleted all AssemblyFileVersion directives	Diva Canto	2013-02-19	1	-1/+1
\| \| \|
\| * \|	* Fix walking to <NaN, NaN, NaN> via autopilot.	teravus	2013-02-16	1	-1/+5
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-16	3	-5/+5
\|\ \ \ \| \|/ /
\| * \|	Add regression test TestSaveNonRootFolderToIar	Justin Clark-Casey (justincc)	2013-02-16	3	-5/+5
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-15	3	-3/+62
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
\| * \|	Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵	Justin Clark-Casey (justincc)	2013-02-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
\| * \|	Add EventManager events triggered when a SOP is added or removed	Robert Adams	2013-02-14	2	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \|	from the physical scene. Invocations added in SceneObjectPart.
\| * \|	Add an event and some logic to allow customizing Simulator Features by avatar	Melanie	2013-02-14	1	-1/+5
\| \| \|
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-14	1	-1/+5
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Add an event and some logic to allow customizing Simulator Features by avatar	Melanie	2013-02-14	1	-1/+5
\| \| \|
* \| \|	Merge branch 'avination' into careminster	Melanie	2013-02-14	1	-20/+75
\|\ \ \ \| \|/ /
\| * \|	Revert "Make keyframes use the sim's frame timer"	Melanie	2013-02-12	1	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f.
\| * \|	Revert "Push updates from keyframe directly to the front of the output queue ↵	Melanie	2013-02-12	3	-24/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
\| * \|	Push updates from keyframe directly to the front of the output queue rather	Melanie	2013-02-12	3	-9/+24
\| \| \| \| \| \| \| \| \| \| \| \|	than through the update system.
\| * \|	Make keyframes use the sim's frame timer	Melanie	2013-02-11	1	-15/+8
\| \| \|
\| * \|	Refactor KeyframeMotion to use one timer class per scene	Melanie	2013-02-11	1	-20/+75
\| \| \|
\| * \|	Actually plumb the new values to physics.	Melanie	2013-02-07	1	-0/+20
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-14	1	-0/+15
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Adds a couple requested functions to the JsonStore script	Mic Bowman	2013-02-13	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node.
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-10	2	-2/+18
\|\ \ \ \| \|/ /
\| * \|	Fix code to check for no spawn points. Possibly a merge artefact?	Melanie	2013-02-10	1	-2/+4
\| \| \|
\| * \|	Fix teleport/telehub issue:	BlueWall	2013-02-10	2	-3/+17
\| \| \| \| \| \| \| \| \| \| \| \|	Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
* \| \|	Merge branch 'master' into careminster	Melanie	2013-02-08	1	-4/+18
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
\| * \|	If a component of a coalesced object fails to deserialization, do not add a ↵	Justin Clark-Casey (justincc)	2013-02-08	1	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading.