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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge	Melanie	2011-10-25	1	-12/+4
\|\
\| *	Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless ↵	Justin Clark-Casey (justincc)	2011-10-20	1	-12/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime) SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame. This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog. This doesn't appear to play much practical role right now. ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
* \|	Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge	Melanie	2011-10-25	2	-13/+5
\|\ \ \| \|/
\| *	For now, stop passing timeStep into methods where it's not actually used.	Justin Clark-Casey (justincc)	2011-10-20	2	-13/+5
\| \|
* \|	Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge	Melanie	2011-10-25	1	-2/+2
\|\ \ \| \|/
\| *	Change wording on asset requests.	Justin Clark-Casey (justincc)	2011-10-19	1	-2/+2
\| \| \| \| \| \| \| \|	Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
* \|	Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge	Melanie	2011-10-25	1	-5/+0
\|\ \ \| \|/
\| *	Removed redundant NotInTransit function from ScenePresence. ↵	Dan Lake	2011-10-19	1	-5/+0
\| \| \| \| \| \| \| \|	IsInTransit=false does the same thing and NotInTransit was not used anywhere.
* \|	Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge	Melanie	2011-10-25	5	-318/+318
\|\ \ \| \|/
\| *	Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵	Dan Lake	2011-10-19	5	-318/+318
\| \| \| \| \| \| \| \|	endings from previous commit.
* \|	Merge commit '8b20faf06c4850df800945c8135aa90c2eebe034' into bigmerge	Melanie	2011-10-25	0	-0/+0
\|\ \ \| \|/
\| *	Merge branch 'master' of git://opensimulator.org/git/opensim	Dan Lake	2011-10-19	2	-72/+100
\| \|\
* \| \	Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge	Melanie	2011-10-25	9	-344/+319
\|\ \ \ \| \|/ /
\| * \|	Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵	Dan Lake	2011-10-19	9	-344/+319
\| \| \| \| \| \| \| \| \| \| \| \|	scene presence by client ID.
* \| \|	Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge	Melanie	2011-10-25	2	-41/+118
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Extend scripts stop/start/suspend/resume console commands to allow action on ↵	Justin Clark-Casey (justincc)	2011-10-19	2	-72/+100
\| \|/ \| \| \| \| \| \| \| \| \| \|	a single script by giving the script item id (which can be found via scripts show). Not an ideal way to do this on a region with many scripts. Needs refinement later.
\| *	Add "scripts stop" and "scripts start" console commands.	Justin Clark-Casey (justincc)	2011-10-19	1	-2/+48
\| \| \| \| \| \| \| \| \| \|	These will stop all running scripts and start all stopped scripts respectively. A stopped script does not save any events for later processing.
\| *	minor: improve command help on scripts suspend/resume	Justin Clark-Casey (justincc)	2011-10-19	1	-2/+5
\| \|
* \|	Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge	Melanie	2011-10-25	2	-22/+54
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
\| *	Fix resume scripts.	Justin Clark-Casey (justincc)	2011-10-19	2	-9/+33
\| \| \| \| \| \| \| \| \| \|	On resume, we need to place requeue the script for event processing if there are any events on the queue. Also need to do this under m_Script lock in order to avoid a race
* \|	Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge	Melanie	2011-10-25	2	-4/+52
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
\| *	Add "scripts suspend" and "scripts resume" commands.	Justin Clark-Casey (justincc)	2011-10-19	2	-3/+53
\| \| \| \| \| \| \| \| \| \|	These aim currently to suspend and resume all scripts. However, resume isn't currently working due to what looks like a bug in resume functionality itself.
* \|	Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge	Melanie	2011-10-25	1	-2/+2
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
\| *	on log and "show scripts" messages, show script item UUID rather than asset UUID	Justin Clark-Casey (justincc)	2011-10-19	1	-4/+4
\| \| \| \| \| \| \| \|	The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
* \|	Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge	Melanie	2011-10-25	3	-7/+31
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
\| *	add current script status to "scripts show" command (running, suspended, etc.)	Justin Clark-Casey (justincc)	2011-10-19	3	-7/+31
\| \|
* \|	Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge	Melanie	2011-10-25	2	-2/+28
\|\ \ \| \|/
\| *	Add "show scripts" command to show all scripts currently known to the script ↵	Justin Clark-Casey (justincc)	2011-10-19	2	-2/+28
\| \| \| \| \| \| \| \| \| \| \| \|	engine in the current region. Also added synonym of "scripts show"
* \|	Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge	Melanie	2011-10-25	4	-27/+58
\|\ \ \| \|/
\| *	Add option to allow remote http calls to setpassword in the ↵	Justin Clark-Casey (justincc)	2011-10-19	4	-27/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	AuthenticationService. This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini Default is false as before.
* \|	Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge	Melanie	2011-10-25	1	-1/+1
\|\ \ \| \|/
\| *	Slightly change log message in LoadRegionsPlugin	Justin Clark-Casey (justincc)	2011-10-19	1	-1/+1
\| \|
* \|	Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge	Melanie	2011-10-25	1	-1/+13
\|\ \ \| \|/
\| *	Region-UUID - can not be zero-uuid	Pixel Tomsen	2011-10-19	1	-1/+13
\| \| \| \| \| \| \| \|	http://opensimulator.org/mantis/view.php?id=3426
* \|	Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge	Melanie	2011-10-25	1	-11/+6
\|\ \ \| \|/
\| *	Make ScopeID optional for http GetAccount and GetAccounts	Justin Clark-Casey (justincc)	2011-10-19	1	-11/+6
\| \| \| \| \| \| \| \|	If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
* \|	Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge	Melanie	2011-10-25	1	-0/+6
\|\ \ \| \|/
\| *	Make PrincipalID a synonym for UserID in GetUserAccount	Justin Clark-Casey (justincc)	2011-10-19	1	-0/+6
\| \|
* \|	Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge	Melanie	2011-10-25	1	-3/+3
\|\ \ \| \|/
\| *	Get new NewUser and SetUserAccount calls to accept PrincipalID instead of ↵	Justin Clark-Casey (justincc)	2011-10-19	1	-3/+3
\| \| \| \| \| \| \| \|	UserID for consistency with output
* \|	Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge	Melanie	2011-10-25	3	-4/+67
\|\ \ \| \|/
\| *	Allow an http call to set account details if AllowSetAccount = true in ↵	Justin Clark-Casey (justincc)	2011-10-19	3	-4/+67
\| \| \| \| \| \| \| \| \| \| \| \|	[UserAccountService]. As before, default is false to not allow these calls.
* \|	Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge	Melanie	2011-10-25	6	-10/+84
\|\ \ \| \|/
\| *	Provide an option to allow remote calls to the CreateUser method on the ↵	Justin Clark-Casey (justincc)	2011-10-18	6	-10/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
* \|	Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge	Melanie	2011-10-25	1	-0/+6
\|\ \ \| \|/
\| *	Temporarily put in log lines to record time taken to set terrain in OdeScene.	Justin Clark-Casey (justincc)	2011-10-18	1	-0/+6
\| \|
* \|	Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge	Melanie	2011-10-25	2	-2/+10
\|\ \ \| \|/
\| *	Store scene identifier passed in to OdeScene for later debug messages	Justin Clark-Casey (justincc)	2011-10-18	2	-2/+10
\| \|
* \|	Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge	Melanie	2011-10-25	1	-16/+13
\|\ \ \| \|/
\| *	Don't bother taking OdeLock during OdeScene construction, since there can be ↵	Justin Clark-Casey (justincc)	2011-10-18	1	-16/+13
\| \| \| \| \| \| \| \|	no contention until the object is constructed.