aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-314-4/+4
| | | | script state enum to reflect recent changes.
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-3029-699/+813
|\
| * Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-307-187/+166
| | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
| * Replace hardcoded 0 with KickFlags provided by the client.Justin Clark-Casey (justincc)2010-08-281-1/+1
| | | | | | | | This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-281-0/+9
| |\
| | * Addresses mantis #4991 -- HG between two regions with the same map ↵Diva Canto2010-08-271-0/+9
| | | | | | | | | | | | coordinates fails with no warning
| * | very minor log message and var name tweaking for iar savingJustin Clark-Casey (justincc)2010-08-282-5/+8
| |/
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-289-371/+384
| |
| * minor: reduce log chattiness of "load iar" for IARs with lots of foldersJustin Clark-Casey (justincc)2010-08-271-1/+1
| |
| * allow inventory path specified in "load iar" to start with a / (e.g. ↵Justin Clark-Casey (justincc)2010-08-272-1/+33
| | | | | | | | /Objects is now valid where it wasn't before)
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-272-13/+40
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-2614-131/+193
| | |\
| | | * More on mantis #4985Diva Canto2010-08-261-6/+14
| | | |
| | | * Addresses mantis #4985 -- exceptions in DataSnapshotDiva Canto2010-08-261-7/+23
| | | |
| | * | Send a null result search packet when no results are passsed inMelanie2010-08-261-1/+4
| | | |
| * | | refactor: Make IAR tests set up standard iar for loadingJustin Clark-Casey (justincc)2010-08-271-44/+60
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-261-3/+12
| |\ \
| | * | Addresses mantis #4984 -- Datasnapshot exceptions.Diva Canto2010-08-261-3/+12
| | |/
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-261-3/+4
| | |
| * | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵Justin Clark-Casey (justincc)2010-08-262-49/+58
| | | | | | | | | | | | since this appears to relate solely to attachments
| * | refactor: break out attachment position change code in ↵Justin Clark-Casey (justincc)2010-08-263-25/+41
| | | | | | | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions.
| * | minor: change log message from info to debugJustin Clark-Casey (justincc)2010-08-261-1/+1
| | |
| * | Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-267-36/+7
| | |
| * | Reinstate kill record check that prevents an entity update being sent to a ↵Justin Clark-Casey (justincc)2010-08-261-1/+19
| | | | | | | | | | | | | | | | | | | | | client after it has been told that the entity has been deleted. On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog. This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
| * | Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()Justin Clark-Casey (justincc)2010-08-261-2/+16
| |/ | | | | | | By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
* | Remove CRLF endingsMelanie2010-08-301-1045/+1045
| |
* | Fix a horrible bug in SG, where iteration of scene objects is carriedMelanie Thielker2010-08-261-2/+4
| | | | | | | | | | out in a fashion that causes the delegate to be invoked once per child prim for a given group.
* | Correct whitespaceMelanie Thielker2010-08-261-510/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-2621-604/+1275
|\ \ | |/ | | | | This was rather conflicted. Please test linking.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-262-27/+38
| |\ | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵Justin Clark-Casey (justincc)2010-08-261-1/+1
| | | | | | | | | | | | always 0 (and any other number would cause an error anyway)
| * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵Justin Clark-Casey (justincc)2010-08-2619-586/+739
| | | | | | | | | | | | conditions in linking and unlinking
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-251-3/+1
| | |
| * | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUIDJustin Clark-Casey (justincc)2010-08-251-1/+10
| | | | | | | | | | | | Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
| * | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵Justin Clark-Casey (justincc)2010-08-253-55/+82
| | | | | | | | | | | | SceneObjectPartInventory
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-257-78/+275
|\ \ \ | | |/ | |/|
| * | Make scene object directories more robust and prevent deleted SOP's fromMelanie Thielker2010-08-252-18/+29
| |/ | | | | | | sticking around
| * Split out actual scene object insertion code from Scene.Inventory.RezObject ↵Justin Clark-Casey (justincc)2010-08-243-25/+62
| | | | | | | | | | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-243-10/+20
| |\
| * | refactor: make RezObject() more readableJustin Clark-Casey (justincc)2010-08-241-69/+68
| | |
| * | add test to check move of task item to user inventory when a target folder ↵Justin Clark-Casey (justincc)2010-08-241-0/+26
| | | | | | | | | | | | is explicitly given
| * | minor: stop test using obsolete propertyJustin Clark-Casey (justincc)2010-08-241-1/+1
| | |
| * | refactor TestMoveTaskInventoryItemNoParent()Justin Clark-Casey (justincc)2010-08-241-24/+37
| | |
| * | Add automated test at the opensim 'api' level to check that a given item ↵Justin Clark-Casey (justincc)2010-08-244-4/+126
| | | | | | | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings
* | | Change object cleanup again. Make scene object directories more robust andMelanie Thielker2010-08-252-19/+30
| | | | | | | | | | | | prevent deleted SOP's from sticking around
* | | Correct a logic error in attachment cleanupMelanie Thielker2010-08-251-4/+9
| | |
* | | Lock the attachment cleanup so it doesn't go into an endless deletion frenzyMelanie Thielker2010-08-251-16/+20
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-08-242-0/+39
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Call the cleanup after saving attachment states, so that the attachmentsMelanie Thielker2010-08-241-1/+3
| | | | | | | | | | | | | | | | don't get killed before they can be saved
| * | | Call the Cleanup when an agent logs out, when an agent leaves and justMelanie Thielker2010-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport