| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+4 |
|\ \
| |/ |
|
| * | On setting a new avatar appearance, if height hasn't changed then don't set t... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+4 |
* | | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+10 |
|\ \
| |/ |
|
| * | Stop the avatar stalling on its first boarder cross when using the ODE plugin | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+10 |
* | | 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 | 3 | -6/+23 |
|\ \
| |/ |
|
| * | 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 '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -82/+0 |
|\ \
| |/ |
|
| * | Correctly create a freshly created estate owner's default items and avatar en... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -82/+0 |
* | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Write code to create minimum necessary body parts/clothing and avatar entries... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -0/+1 |
* | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 5 | -39/+49 |
|\ \
| |/ |
|
| * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... | Justin Clark-Casey (justincc) | 2011-09-15 | 5 | -38/+38 |
| * | Only bother to create an inventory xfer file if there are any items in a prim... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -2/+2 |
| * | Shuffle order of code in invnetory connector GetFolderContent() calls to avoi... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -1/+1 |
* | | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+11 |
|\ \
| |/ |
|
| * | If a prim inventory becomes empty through deletion, send an empty xfer file n... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -20/+43 |
* | | Fixed a movement regression - Kitto's jump code is no longer needed (plus it'... | Tom | 2011-09-14 | 1 | -37/+9 |
* | | Bring us up to date. | Tom | 2011-09-14 | 9 | -163/+287 |
|\ \
| |/ |
|
| * | Don't try and delete attachments for child agent close | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -1/+2 |
| * | Stop attempts to rewear already worn items from removing and reattaching. | Justin Clark-Casey (justincc) | 2011-09-13 | 3 | -2/+20 |
| * | Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ... | Justin Clark-Casey (justincc) | 2011-09-13 | 2 | -10/+33 |
| * | stop the duplicate remove of the root part ids from the full part and local p... | Justin Clark-Casey (justincc) | 2011-09-13 | 2 | -3/+1 |
| * | extend TestGetSceneObjectByPartLocalId() to test state after scene object del... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -0/+6 |
| * | In SG.AddSceneObject(), stop unnecessarily adding the root part to object ind... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -7/+5 |
| * | Add new TestGetSceneObjectByPartLocalId() for retrieving a scene object via t... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -0/+27 |
| * | improve TestAddSceneObject() to test a multi-part object rather than a single... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -11/+14 |
| * | In an object return message, send a null-terminated empty string in binary bu... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -1/+3 |
| * | eliminate redundant SP.m_regionInfo since it always has the scene. | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -8/+6 |
| * | remove the unused SP.initializeScenePresence() | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -23/+2 |
| * | stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is... | Justin Clark-Casey (justincc) | 2011-09-12 | 3 | -10/+7 |
| * | minor: if the script engine fails to find a prim for a script, also print out... | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -0/+4 |
| * | Start locking entire add/remove operations on an IScenePresence.AttachmentsSy... | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -0/+4 |
| * | minor: put <remarks> tags around some method doc | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -5/+6 |
| * | lock attachments when enumerating through them in ScenePresence.CopyTo(). | Justin Clark-Casey (justincc) | 2011-09-10 | 1 | -20/+24 |
| * | Add extra log information when attachments fail validation | Justin Clark-Casey (justincc) | 2011-09-10 | 1 | -1/+9 |
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -2/+22 |
| * | Save the default terrain texture UUIDs for a new region instead of leaving th... | Justin Clark-Casey (justincc) | 2011-09-09 | 1 | -1/+36 |
| * | Lock m_pendingObjects when calling GetPendingObjectsCount(). | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -1/+2 |
| * | Comment out SceneViewer.Reset() and stop calling from Close() since this is u... | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -16/+17 |
| * | In SceneViewer, introduce an IsEnabled flag and perform Close() under an m_pe... | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -18/+41 |
| * | Try disabling the inconsistent attachment state check to see if this actually... | Justin Clark-Casey (justincc) | 2011-09-05 | 1 | -9/+7 |
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 5 | -326/+160 |
* | | First set of merge fixes | Tom | 2011-09-07 | 6 | -381/+147 |
* | | Now merging the core changes. | Tom | 2011-09-04 | 1 | -421/+444 |
* | | Change of tactic. Reverting this to the careminster version, then i'll select... | Tom | 2011-09-04 | 1 | -635/+1117 |
* | | I fucked up the merge for SOG, so reverting back to OpenSim Core's version... | Tom | 2011-09-04 | 1 | -1005/+255 |