aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmergeMelanie2011-10-111-0/+6
|\
| * Add back BulletSPlugin.dll.config that I somehow managed to delete today in a...Justin Clark-Casey (justincc)2011-09-171-0/+6
* | 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 '744602f6d170373882cb31155c8c899b43a5339e' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Revert "uncomment Standalone config in OpenSim.ini.example."Justin Clark-Casey (justincc)2011-09-171-1/+1
* | 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 commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmergeMelanie2011-10-111-6/+94
|\ \ | |/
| * Fix base_hair.dat to actually contain the base hair asset rather than base ey...Justin Clark-Casey (justincc)2011-09-161-6/+94
* | Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-163-7/+3
| |\
* | \ 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 '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2011-09-161-1/+4
| |\ \ | | |/
* | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-113-7/+3
|\ \ \ | |/ /
| * | Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-163-7/+3
* | | 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
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-168-146/+267
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-112-4/+14
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-162-4/+14
* | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmergeMelanie2011-10-113-2/+21
|\ \ | |/
| * On standalone, by default create the necessary minimum body parts and clothes...Justin Clark-Casey (justincc)2011-09-163-2/+21
* | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-112-45/+52
|\ \ | |/
| * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-162-45/+52
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-115-93/+69
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-165-94/+70
* | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-1112-148/+362
|\ \ | |/
| * Write code to create minimum necessary body parts/clothing and avatar entries...Justin Clark-Casey (justincc)2011-09-1512-148/+362
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-118-44/+54
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-158-43/+43
* | Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Only bother to create an inventory xfer file if there are any items in a prim...Justin Clark-Casey (justincc)2011-09-151-2/+2
* | Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmergeMelanie2011-10-112-12/+18
|\ \ | |/
| * Shuffle order of code in invnetory connector GetFolderContent() calls to avoi...Justin Clark-Casey (justincc)2011-09-153-13/+19
* | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmergeMelanie2011-10-111-0/+11
|\ \ | |/
| * If a prim inventory becomes empty through deletion, send an empty xfer file n...Justin Clark-Casey (justincc)2011-09-151-20/+43
* | Fixed a movement regression - Kitto's jump code is no longer needed (plus it'...Tom2011-09-141-37/+9
* | Fix a rather stupid VS warning "The operation overflows at compile time in ch...Tom2011-09-141-3/+3
* | Bring us up to date.Tom2011-09-1449-624/+1316
|\ \ | |/
| * Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-132-1/+34
generated by cgit v1.1 at 2024-11-15 03:05:18 +0000