 Melanie
|
24235006f4
Merge branch 'master' into bigmerge
|
13 years ago |
 Dan Lake
|
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
|
13 years ago |
|
Melanie
|
26a4f32013
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
|
13 years ago |
|
Melanie
|
243acef917
Merge branch 'master' into bigmerge
|
13 years ago |
|
Melanie
|
ce8419fdd0
Fix link order when linking sets to sets
|
13 years ago |
|
Dan Lake
|
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
|
13 years ago |
|
Melanie
|
083b28de8c
Merge branch 'master' into bigmerge
|
13 years ago |
 Justin Clark-Casey (justincc)
|
6d97545b6b
Remove the SyncRoot locking from Scene which was only being done around the main physics loop and ScenePresence position and velocity setting
|
13 years ago |
|
Melanie
|
b975cbcbed
Merge branch 'master' into bigmerge
|
13 years ago |
|
Dan Lake
|
b98613091c
Added new ForEachRootScenePresence to Scene since almost every delegate passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
|
13 years ago |
|
Melanie
|
4e88fe42e4
Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge
|
13 years ago |
|
Melanie
|
e68226afd3
Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
ca83f99332
Instead of adding stat agentMS in all kinds of places, calculate it instead in the main Scene.Update() loop, like the other stats
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
7d033187d8
Make reported sim fps more accurate, in line with frame time ms
|
13 years ago |
 Tom
|
5484c9b585
Bring us up to date.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
8880aea728
Stop attempts to rewear already worn items from removing and reattaching.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
618277e797
Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID itemID) for now
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
df73833a2c
stop the duplicate remove of the root part ids from the full part and local part indexes in SG.DeleteSceneObject()
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
07ba28f1de
In SG.AddSceneObject(), stop unnecessarily adding the root part to object indexes sepearately from the other parts.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
56cd7d9685
stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is always passed in at the same time.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
00f8946bd4
minor: if the script engine fails to find a prim for a script, also print out that prim's local id in the error message.
|
13 years ago |
|
Tom
|
03f6734f43
First set of merge fixes
|
13 years ago |
|
Tom
|
66dec3b874
Resolve merge commits, stage 1
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
7eca929686
Eliminate pointless checks of SOG.RootPart != null
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
095b3e5756
Remove pointless cluttering SOP.ParentGroup != null checks.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
1de68b34d9
refactor: migrate DropObject handling fully into AttachmentsModule from Scene
|
13 years ago |
 Makopoppo
|
795b56e695
Related to #4689 - Adding missing null check for SceneObjectPart
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
c1a34cd8da
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
0ef29da9b2
refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consistency
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
4b9ef4f39c
Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what it actually does and is more consistent with other method names.
|
13 years ago |
