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	2014-01-28	16	-101/+265
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| *	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-14	1	-1/+1
\| \|\
\| \| *	minor: Add David Rowe to ctrlaltdavid handle by request	Justin Clark-Casey (justincc)	2014-01-14	1	-1/+1
\| \| \|
\| * \|	Fix crash in BulletSim which sometimes happens making a linkset physical	Robert Adams	2014-01-10	1	-7/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(like sitting on and activating a vehicle) and crossing borders. This keeps better bookkeeping on compound shapes so BulletSim can identify them when being freed.
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-11	2	-2/+4
\| \|\ \ \| \| \|/
\| \| *	Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.	Oren Hurvitz	2014-01-11	2	-2/+4
\| \| \|
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-10	2	-4/+4
\| \|\ \ \| \| \|/
\| \| *	In library inventory, correct asset id for llSay example script	Justin Clark-Casey (justincc)	2014-01-10	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From http://opensimulator.org/mantis/view.php?id=6917 Thanks to FreakyTech for this spot.
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-10	2	-1/+2
\| \|\ \ \| \| \|/
\| \| *	minor: Add ctrlaltdavid to contributors list	Justin Clark-Casey (justincc)	2014-01-10	1	-0/+1
\| \| \|
\| \| *	Fixed llTextBox error message text	David Rowe	2014-01-10	1	-1/+1
\| \| \|
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-10	1	-5/+5
\| \|\ \ \| \| \|/
\| \| *	Dynamically adjust to the number of visual params sent.	Melanie	2014-01-10	1	-1/+1
\| \| \|
\| \| *	When moving the root prim of an attachment: a) Change the attach position; ↵	Oren Hurvitz	2014-01-10	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	b) Move the other prims in the reverse direction to compensate
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-10	8	-145/+240
\| \|\ \ \| \| \|/
\| \| *	When creating a coalesced object, set its permissions to the ↵	Oren Hurvitz	2014-01-10	1	-7/+16
\| \| \| \| \| \| \| \| \| \| \| \|	lowest-common-denominator of all the sub-objects
\| \| *	When creating a coalesced object, set its Creator ID if all the objects have ↵	Oren Hurvitz	2014-01-10	1	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \|	the same creator
\| \| *	Refactored: use a single function to apply an object's folded permissions to ↵	Oren Hurvitz	2014-01-10	6	-39/+48
\| \| \| \| \| \| \| \| \| \| \| \|	its main permissions
\| \| *	Refactored setting permissions when rezzing items: use the same function ↵	Oren Hurvitz	2014-01-10	5	-94/+160
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-08	2	-8/+19
\| \|\ \ \| \| \|/
\| \| *	If an agent is sitting, then do send the rotation in the agent update ↵	Justin Clark-Casey (justincc)	2014-01-08	2	-8/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of zeroing it to resolve mouselook camera problems Addresses http://opensimulator.org/mantis/view.php?id=6892 Thanks to tglion for this spot. This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7
* \| \|	Remove the core module extra profile settings support carried in with the latest	Melanie	2014-01-05	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	patches. We don't need it.
* \| \|	Intermediate commit. Sill errors.	Melanie	2014-01-05	36	-8803/+10755
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
\| * \|	Some missing definitions needed for successful compilation.	Robert Adams	2014-01-04	2	-2/+4
\| \| \|
\| * \|	Remove some chatty DebugFormat statements. No functional changes.	Robert Adams	2014-01-04	2	-5/+4
\| \| \|
\| * \|	varregion: Add region size to teleport event messages (EnableSimulator,	Robert Adams	2014-01-04	9	-39/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
\| * \|	varregion: send region size in LLLoginResponse.	Robert Adams	2014-01-04	2	-1/+13
\| \| \|
\| * \|	Add routines in Util.cs for conversion of region handles to region	Robert Adams	2014-01-04	2	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	locations and for the conversion of region world location to region 'region' location. These routines will replace all the arithmatic scattered throughout OpenSimulator.
\| * \|	Dynamically adjust to the number of visual params sent.	Melanie	2014-01-04	1	-1/+1
\| \| \|
\| * \|	Initialize default region size in GridRegion in the no parameter constructor	Robert Adams	2013-12-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	as is used by the grid connector tests.
\| * \|	Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵	Robert Adams	2013-12-28	4	-39/+195
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size.
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2013-12-21	2	-8623/+10023
\| \|\ \ \| \| \|/
\| \| *	Add lsl arg syntax checking for control event	Justin Clark-Casey (justincc)	2013-12-21	2	-9386/+9716
\| \| \|
\| \| *	refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for ↵	Justin Clark-Casey (justincc)	2013-12-21	1	-7907/+7903
\| \| \| \| \| \| \| \| \| \| \| \|	consistency
\| \| *	Add arg checking for at_target lsl event	Justin Clark-Casey (justincc)	2013-12-21	2	-8828/+9158
\| \| \|
\| \| *	Add lsl event arg checking for at_rot_target	Justin Clark-Casey (justincc)	2013-12-21	2	-8915/+9306
\| \| \|
\| \| *	Add lsl event argument checking for attach and on_rez	Justin Clark-Casey (justincc)	2013-12-21	2	-8593/+8946
\| \| \|
\| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2013-12-19	4	-8/+71
\| \|\ \ \| \| \|/
\| \| *	Add missing viewer param elements for butt and breast physics.	Justin Clark-Casey (justincc)	2013-12-19	1	-1/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces Thanks cinderblocks!
\| \| *	Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵	Justin Clark-Casey (justincc)	2013-12-18	4	-8/+71
\| \| \| \| \| \| \| \| \| \| \| \|	sending
\| * \|	Fix issue with editing notes for other avatars	BlueWall	2013-12-16	2	-2/+6
\| \| \|
\| * \|	Populate user preferences with UserAccount email if it is present, else ↵	BlueWall	2013-12-16	3	-7/+73
\| \| \| \| \| \| \| \| \| \| \| \|	return an error indicating no email is on record for the user.
\| * \|	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim	Melanie	2013-12-16	11	-84/+97
\| \|\ \
\| \| * \	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2013-12-14	1	-1/+1
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Extend TestLlGetNotecardLine() regression test to contain chars that are two ↵	Justin Clark-Casey (justincc)	2013-12-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bytes in utf8
\| \| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2013-12-14	1	-15/+15
\| \| \|\ \ \| \| \| \|/
\| \| \| *	ParseNotecardToList() returned data past end of notecard text (mantis #6881).	Kevin Cozens	2013-12-14	1	-15/+15
\| \| \| \|
\| \| * \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2013-12-14	4	-23/+24
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Wrap analysis of the particle system in the UUID Gatherer in a separate ↵	Justin Clark-Casey (justincc)	2013-12-14	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion.
\| \| \| *	After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵	Justin Clark-Casey (justincc)	2013-12-14	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented