| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-21 | 2 | -12/+18 |
| |\ |
|
* | \ | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 3 | -5/+110 |
|\ \ \
| |/ / |
|
| * | | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. | Justin Clark-Casey (justincc) | 2011-09-21 | 3 | -6/+115 |
* | | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | Null simulation data must return a non-null region settings or other parts of... | Dan Lake | 2011-09-20 | 1 | -2/+4 |
* | | | Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-20 | 3 | -66/+0 |
| |\ \
| | |/ |
|
* | | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+13 |
|\ \ \
| |/ / |
|
| * | | Make debug statements in ScenePresence consistent and add a few more | Dan Lake | 2011-09-20 | 1 | -10/+14 |
* | | | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge | Melanie | 2011-10-11 | 3 | -66/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove vestigal OpenSim.Data mono addins extension points that don't look lik... | Justin Clark-Casey (justincc) | 2011-09-20 | 3 | -66/+0 |
| |/ |
|
* | | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | adjust some whitespace to trigger another build, to check the last failure wa... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -2/+2 |
* | | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Add BulletSim physics option details to OpenSim.ini.example. Marked as in de... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+2 |
* | | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge | Melanie | 2011-10-11 | 11 | -7086/+1 |
|\ \
| |/ |
|
| * | Remove old bullet DotNET and X libraries in preparation for BulletS | Justin Clark-Casey (justincc) | 2011-09-17 | 11 | -7087/+1 |
* | | Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+6 |
|\ \
| |/ |
|
| * | Add back BulletSPlugin.dll.config that I somehow managed to delete today in a... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+6 |
* | | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge | Melanie | 2011-10-11 | 2 | -1/+7 |
|\ \
| |/ |
|
| * | On setting a new avatar appearance, if height hasn't changed then don't set t... | Justin Clark-Casey (justincc) | 2011-09-17 | 2 | -1/+7 |
* | | Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Revert "uncomment Standalone config in OpenSim.ini.example." | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -1/+1 |
* | | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge | Melanie | 2011-10-11 | 2 | -6/+23 |
|\ \
| |/ |
|
| * | Stop the avatar stalling on its first boarder cross when using the ODE plugin | Justin Clark-Casey (justincc) | 2011-09-16 | 2 | -6/+23 |
* | | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+4 |
|\ \
| |/ |
|
| * | minor: I was wrong about OffsetPosition - sometimes it genuinely does return ... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+4 |
* | | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge | Melanie | 2011-10-11 | 4 | -7/+24 |
|\ \
| |/ |
|
| * | Remove setter from SP.OffsetPosition, since all sets should flow through SP.A... | Justin Clark-Casey (justincc) | 2011-09-16 | 2 | -5/+23 |
* | | Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge | Melanie | 2011-10-11 | 1 | -6/+94 |
|\ \
| |/ |
|
| * | Fix base_hair.dat to actually contain the base hair asset rather than base ey... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -6/+94 |
* | | Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-16 | 3 | -7/+3 |
| |\ |
|
* | \ | Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge | Melanie | 2011-10-11 | 1 | -91/+88 |
|\ \ \
| |/ / |
|
| * | | Updated some variables to be closer to the coding standards (and easier to un... | Kevin Houlihan | 2011-09-16 | 1 | -91/+88 |
* | | | Merge commit '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | justincc | 2011-09-16 | 1 | -1/+4 |
| |\ \
| | |/ |
|
* | | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 3 | -7/+3 |
|\ \ \
| |/ / |
|
| * | | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 3 | -7/+3 |
* | | | Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | Passwords could be revealed in console by pressing backspace. | Kevin Houlihan | 2011-09-16 | 1 | -1/+4 |
| |/ |
|
* | | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge | Melanie | 2011-10-11 | 3 | -7/+71 |
|\ \
| |/ |
|
| * | MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore and... | Chris Hart | 2011-09-16 | 3 | -7/+71 |
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 8 | -146/+267 |
|\ \
| |/ |
|
| * | Reattaching a region was failing if the estate name had not changed (issue 50... | Kevin Houlihan | 2011-09-16 | 8 | -146/+267 |
* | | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge | Melanie | 2011-10-11 | 2 | -4/+14 |
|\ \
| |/ |
|
| * | Pass any region scope through to the CreateUser() method | Justin Clark-Casey (justincc) | 2011-09-16 | 2 | -4/+14 |
* | | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge | Melanie | 2011-10-11 | 3 | -2/+21 |
|\ \
| |/ |
|
| * | On standalone, by default create the necessary minimum body parts and clothes... | Justin Clark-Casey (justincc) | 2011-09-16 | 3 | -2/+21 |