aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmergeMelanie2011-10-113-0/+20
|\
| * llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
* | Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmergeMelanie2011-10-111-0/+5
|\ \ | |/
| * Add en_US culture setting to the async delete to inventory thread, to avoid a...Justin Clark-Casey (justincc)2011-09-261-0/+5
* | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-112-1/+14
|\ \ | |/
| * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar...Snoopy Pfeffer2011-09-252-2/+11
* | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmergeMelanie2011-10-111-9/+0
|\ \ | |/
| * Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-9/+0
* | Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmergeMelanie2011-10-111-30/+0
|\ \ | |/
| * Removed uncalled region load method.Kevin Houlihan2011-09-241-30/+0
* | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-114-38/+69
|\ \ | |/
| * Added a setting to [Startup] section of config that will allow the simulator ...Kevin Houlihan & Michelle Argus2011-09-244-24/+58
* | Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmergeMelanie2011-10-111-1/+11
|\ \ | |/
| * Don't try and resolve user account for authorization if the agent has come in...Justin Clark-Casey (justincc)2011-09-241-1/+11
* | Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmergeMelanie2011-10-111-14/+17
|\ \ | |/
| * Improve locking when access queue in EventQueueGetModuleJustin Clark-Casey (justincc)2011-09-241-14/+17
* | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
|\ \ | |/
| * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
* | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-118-109/+270
|\ \ | |/
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-238-93/+270
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-221-5/+5
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-2112-90/+28
| | |\
* | | \ Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmergeMelanie2011-10-112-9/+18
|\ \ \ \ | |/ / /
| * | | Fix failure to teleport when an agent is lured on the same sim (and probably ...Justin Clark-Casey (justincc)2011-09-222-9/+18
| | |/ | |/|
* | | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmergeMelanie2011-10-111-5/+5
|\ \ \ | | |/ | |/|
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-1112-90/+28
|\ \ \ | | |/ | |/|
| * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-2212-90/+28
| |/
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-113-2/+203
|\ \ | |/
| * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-213-1/+203
* | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmergeMelanie2011-10-111-8/+0
|\ \ | |/
| * Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
| * get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-212-12/+18
| |\
* | \ Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-113-5/+110
|\ \ \ | |/ /
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-213-6/+115
* | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmergeMelanie2011-10-111-2/+4
|\ \ \ | | |/ | |/|
| * | Null simulation data must return a non-null region settings or other parts of...Dan Lake2011-09-201-2/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-203-66/+0
| |\ \ | | |/
* | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmergeMelanie2011-10-111-9/+13
|\ \ \ | |/ /
| * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
* | | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-113-66/+0
|\ \ \ | | |/ | |/|
| * | Remove vestigal OpenSim.Data mono addins extension points that don't look lik...Justin Clark-Casey (justincc)2011-09-203-66/+0
| |/
* | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/
| * adjust some whitespace to trigger another build, to check the last failure wa...Justin Clark-Casey (justincc)2011-09-171-2/+2
* | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmergeMelanie2011-10-119-7026/+0
|\ \ | |/
| * Remove old bullet DotNET and X libraries in preparation for BulletSJustin Clark-Casey (justincc)2011-09-179-7027/+0
* | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmergeMelanie2011-10-112-1/+7
|\ \ | |/
| * On setting a new avatar appearance, if height hasn't changed then don't set t...Justin Clark-Casey (justincc)2011-09-172-1/+7
* | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-112-6/+23
|\ \ | |/