aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-112-1/+17
|\
| * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-162-1/+17
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-82/+0
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-161-82/+0
* | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * Write code to create minimum necessary body parts/clothing and avatar entries...Justin Clark-Casey (justincc)2011-09-151-0/+1
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-115-39/+49
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-155-38/+38
| * 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
| * Shuffle order of code in invnetory connector GetFolderContent() calls to avoi...Justin Clark-Casey (justincc)2011-09-151-1/+1
* | 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
* | Bring us up to date.Tom2011-09-1414-181/+373
|\ \ | |/
| * Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-131-1/+2
| * Remove UpdateKnownItem() from IAttachmentsModule.Justin Clark-Casey (justincc)2011-09-131-9/+0
| * Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-133-2/+20
| * Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ...Justin Clark-Casey (justincc)2011-09-132-10/+33
| * stop the duplicate remove of the root part ids from the full part and local p...Justin Clark-Casey (justincc)2011-09-132-3/+1
| * extend TestGetSceneObjectByPartLocalId() to test state after scene object del...Justin Clark-Casey (justincc)2011-09-131-0/+6
| * In SG.AddSceneObject(), stop unnecessarily adding the root part to object ind...Justin Clark-Casey (justincc)2011-09-131-7/+5
| * Add new TestGetSceneObjectByPartLocalId() for retrieving a scene object via t...Justin Clark-Casey (justincc)2011-09-131-0/+27
| * improve TestAddSceneObject() to test a multi-part object rather than a single...Justin Clark-Casey (justincc)2011-09-131-11/+14
| * In an object return message, send a null-terminated empty string in binary bu...Justin Clark-Casey (justincc)2011-09-131-1/+3
| * eliminate redundant SP.m_regionInfo since it always has the scene.Justin Clark-Casey (justincc)2011-09-121-8/+6
| * remove the unused SP.initializeScenePresence()Justin Clark-Casey (justincc)2011-09-121-23/+2
| * stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is...Justin Clark-Casey (justincc)2011-09-123-10/+7
| * minor: if the script engine fails to find a prim for a script, also print out...Justin Clark-Casey (justincc)2011-09-121-0/+4
| * comment out some recent terrain texture loggingJustin Clark-Casey (justincc)2011-09-121-1/+1
| * Start locking entire add/remove operations on an IScenePresence.AttachmentsSy...Justin Clark-Casey (justincc)2011-09-123-0/+21
| * When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-121-0/+54
| * minor: put <remarks> tags around some method docJustin Clark-Casey (justincc)2011-09-121-5/+6
| * lock attachments when enumerating through them in ScenePresence.CopyTo().Justin Clark-Casey (justincc)2011-09-101-20/+24
| * Add extra log information when attachments fail validationJustin Clark-Casey (justincc)2011-09-101-1/+9
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-092-2/+27
| * Save the default terrain texture UUIDs for a new region instead of leaving th...Justin Clark-Casey (justincc)2011-09-091-1/+36
| * Lock m_pendingObjects when calling GetPendingObjectsCount().Justin Clark-Casey (justincc)2011-09-061-1/+2
| * Comment out SceneViewer.Reset() and stop calling from Close() since this is u...Justin Clark-Casey (justincc)2011-09-061-16/+17
| * Comment out unused ISceneViewer.Reset() to reduce code complexityJustin Clark-Casey (justincc)2011-09-061-1/+1
| * In SceneViewer, introduce an IsEnabled flag and perform Close() under an m_pe...Justin Clark-Casey (justincc)2011-09-062-19/+51
| * Get rid of the confusing version of IAttachmentsModule.RezSingleAttachmentFro...Justin Clark-Casey (justincc)2011-09-061-14/+0
| * Try disabling the inconsistent attachment state check to see if this actually...Justin Clark-Casey (justincc)2011-09-051-9/+7
* | Merge fixes, and fix the buildTom2011-09-146-327/+161
* | First set of merge fixesTom2011-09-076-381/+147
* | Now merging the core changes.Tom2011-09-041-421/+444
* | Change of tactic. Reverting this to the careminster version, then i'll select...Tom2011-09-041-635/+1117
* | I fucked up the merge for SOG, so reverting back to OpenSim Core's version...Tom2011-09-041-1005/+255
* | Resolve merge commits, stage 1Tom2011-09-0442-1788/+2713
|\ \ | |/
| * Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2011-09-033-7/+57
| * Comment out Scene.CleanDroppedAttachments() and calls.Justin Clark-Casey (justincc)2011-09-021-36/+36