aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-162-6/+23
* | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * minor: I was wrong about OffsetPosition - sometimes it genuinely does return ...Justin Clark-Casey (justincc)2011-09-161-0/+4
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-114-7/+24
|\ \ | |/
| * Remove setter from SP.OffsetPosition, since all sets should flow through SP.A...Justin Clark-Casey (justincc)2011-09-162-5/+23
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-161-1/+2
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2011-09-161-1/+4
| | |\
* | | \ Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmergeMelanie2011-10-111-91/+88
|\ \ \ \ | |/ / /
| * | | Updated some variables to be closer to the coding standards (and easier to un...Kevin Houlihan2011-09-161-91/+88
| | |/ | |/|
* | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-111-1/+2
|\ \ \ | | |/ | |/|
| * | Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-1/+2
* | | Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmergeMelanie2011-10-111-1/+4
|\ \ \ | | |/ | |/|
| * | Passwords could be revealed in console by pressing backspace.Kevin Houlihan2011-09-161-1/+4
| |/
* | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmergeMelanie2011-10-113-7/+71
|\ \ | |/
| * MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore and...Chris Hart2011-09-163-7/+71
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-118-146/+267
|\ \ | |/