aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-313-3/+3
| | | | script state enum to reflect recent changes.
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-3012-174/+113
|\
| * Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-301-1/+2
| | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-285-75/+84
| |
| * 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-261-47/+0
| | | | | | | | since this appears to relate solely to attachments
| * refactor: break out attachment position change code in ↵Justin Clark-Casey (justincc)2010-08-262-24/+21
| | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions.
| * Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-267-36/+7
| |
| * 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.
* | 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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-267-167/+265
|\ \ | |/ | | | | 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-266-136/+205
| | | | | | | | | | | | conditions in linking and unlinking
| * | 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-255-75/+254
|\ \ \ | | |/ | |/|
| * | 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
| * 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-242-1/+105
| | | | | | | | | | | | 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
| |
* | 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
* | Add a method to delete left over / dropped attachmentsMelanie Thielker2010-08-241-0/+32
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-231-3/+9
|\ \ | |/
| * minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.csJustin Clark-Casey (justincc)2010-08-231-1/+5
| |
| * Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-231-2/+4
| |
* | Add printing the default script engine name. Report real exceptions whenMelanie Thielker2010-08-221-2/+3
| | | | | | | | | | there is an issue with the config file, as a typo could cause configuration to silently fail.
* | Suppress error messages about scripts not foind if they're in fact disabledMelanie Thielker2010-08-221-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-213-54/+58
|\ \ | |/
| * Unit test breakage fix.Diva Canto2010-08-202-6/+11
| |
| * Cleaned up a few more things related to incoming agents.Diva Canto2010-08-201-45/+42
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-201-25/+27
| |\
| | * Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵Diva Canto2010-08-191-25/+27
| | | | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
| * | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-201-9/+54
| |/ | | | | | | to make it more configurable.
* | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie Thielker2010-08-201-8/+53
| | | | | | | | to make it more configurable.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-191-1/+1
|\ \ | |/
| * minor: Correct string format in "Can't find linkset root prim" messageJustin Clark-Casey (justincc)2010-08-191-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-1810-397/+83
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-189-395/+81
| |\ \ | | |/
| | * Updated the create_region command in the RemoteAdmin plugin to properly ↵randomhuman2010-08-131-39/+0
| | | | | | | | | | | | support estates without seeking further input on the console.
| | * refactor: move binary statistics logging from scene into separate region moduleJustin Clark-Casey (justincc)2010-08-132-110/+12
| | |
| | * refactor: move Scene.PerformObjectBuy into BuySellModuleJustin Clark-Casey (justincc)2010-08-134-162/+49
| | |
| | * Establish new Objects/BuySellModuleJustin Clark-Casey (justincc)2010-08-131-22/+1
| | | | | | | | | | | | Move Scene.ObjectSaleInfo() to this