aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-10-121-0/+8
|\
| * Start recording object updates per second statistic (analogue of agent update...Justin Clark-Casey (justincc)2011-10-111-0/+8
* | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmergeMelanie2011-10-121-0/+3
|\ \ | |/
| * Allow monitoring of stats by region nameJustin Clark-Casey (justincc)2011-10-101-0/+3
* | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmergeMelanie2011-10-1215-20/+325
|\ \ | |/
| * Add other region stats (total frame time, physics fps, etc.) currently missin...Justin Clark-Casey (justincc)2011-10-1015-20/+325
* | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmergeMelanie2011-10-121-15/+35
|\ \ | |/
| * Provide a way to turn the MonitorModule on and offJustin Clark-Casey (justincc)2011-10-101-15/+35
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-061-1/+1
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-061-1/+1
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-071-1/+1
| |/
* | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-121-6/+6
|\ \ | |/
| * Simplified IsInTransit property on ScenePresence and removed InTransit() whic...Dan Lake2011-10-061-6/+6
* | Fix rezzing coalesced object broken by core mergeMelanie2011-10-121-54/+36
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-1/+0
|\ \ | |/
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all...Justin Clark-Casey (justincc)2011-09-301-1/+0
* | Bring us up to date.Tom2011-09-143-25/+41
|\ \ | |/
| * Add extra log information when attachments fail validationJustin Clark-Casey (justincc)2011-09-101-5/+11
| * reinstate the validation logging on teleport. A 'fail' of validation still d...Justin Clark-Casey (justincc)2011-09-101-0/+2
| * Stop the UserManagementModule logging every user it adds for nowJustin Clark-Casey (justincc)2011-09-101-3/+3
| * Use scene presence agent id for rezzed object ownership rather than item owner.Justin Clark-Casey (justincc)2011-09-081-7/+12
| * Add temporary debugging in HGInventoryBroker and RemoveXInventoryServiceConne...Justin Clark-Casey (justincc)2011-09-061-2/+0
| * Try disabling the inconsistent attachment state check to see if this actually...Justin Clark-Casey (justincc)2011-09-051-13/+18
* | First set of merge fixesTom2011-09-071-49/+49
* | Resolve merge commits, stage 1Tom2011-09-046-472/+539
|\ \ | |/
| * Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2011-09-031-32/+35
| * Comment out Scene.CleanDroppedAttachments() and calls.Justin Clark-Casey (justincc)2011-09-021-1/+1
| * Remove redundant RootPart.CreatedSelected = true in IAM.RezObject() since thi...Justin Clark-Casey (justincc)2011-09-021-2/+0
| * Go back to resetting the State parameter for all parts of a SOG when SOG.Clea...Justin Clark-Casey (justincc)2011-09-021-5/+8
| * stop passing FromUserInventoryItemID right down into the deserializer.Justin Clark-Casey (justincc)2011-09-021-4/+2
| * Move more of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-24/+27
| * move more of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-63/+85
| * factor out a section of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-40/+48
| * refactor: factor out DoPostRezWhenFromItem() from IAM.RezObject()Justin Clark-Casey (justincc)2011-09-011-3/+8
| * remove the pointless m_Scene.GetNewRezLocation() call at the top of IAM.RezOb...Justin Clark-Casey (justincc)2011-09-011-7/+4
| * refactor: Move sanity checks to the top of IAM.RezObject() to make the code m...Justin Clark-Casey (justincc)2011-09-011-219/+215
| * use group.RootPart in IAM.RezObject() rather than group.GetChildPart(group.UU...Justin Clark-Casey (justincc)2011-09-011-1/+1
| * Remove pointless NRE check in IAM.RezObject() since this can never occurJustin Clark-Casey (justincc)2011-09-011-15/+1
| * Remove code which was automatically deleting non-root prims from scene object...Justin Clark-Casey (justincc)2011-09-011-0/+4
| * Eliminate pointless checks of SOG.RootPart != nullJustin Clark-Casey (justincc)2011-09-011-1/+1
| * move common code into AttachmentsModule.DeleteAttachmentsFromScene()Justin Clark-Casey (justincc)2011-08-311-5/+1
| * Make SP.Attachments available as sp.GetAttachments() instead.Justin Clark-Casey (justincc)2011-08-311-29/+32
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid poin...Justin Clark-Casey (justincc)2011-08-272-2/+2
| * Stop NPC's getting hypergrid like names in some circumstances.Justin Clark-Casey (justincc)2011-08-191-13/+32
| * Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple attachme...Justin Clark-Casey (justincc)2011-08-171-0/+12
| * When an NPC is created, stop telling neighbouring regions to expect a child a...Justin Clark-Casey (justincc)2011-08-091-1/+5
| * rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-2/+2
| * rename test SceneSetupHelpers -> SceneHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-5/+5