| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 2 | -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-26 | 1 | -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-26 | 6 | -136/+205 | |
| | | | | | | | | | | | | | | | | | conditions in linking and unlinking | |||||
| | | * | | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -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-25 | 2 | -55/+70 | |
| | | | | | | | | | | | | | | | | | SceneObjectPartInventory | |||||
| | * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 5 | -75/+254 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 2 | -18/+29 | |
| | | |/ | | | | | | | | | | sticking around | |||||
| | | * | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 3 | -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 readable | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -69/+68 | |
| | | | | ||||||
| | | * | add test to check move of task item to user inventory when a target folder ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -0/+26 | |
| | | | | | | | | | | | | | is explicitly given | |||||
| | | * | minor: stop test using obsolete property | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | refactor TestMoveTaskInventoryItemNoParent() | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -24/+37 | |
| | | | | ||||||
| | | * | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 2 | -1/+105 | |
| | | | | | | | | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | |||||
| | * | | Change object cleanup again. Make scene object directories more robust and | Melanie Thielker | 2010-08-25 | 2 | -19/+30 | |
| | | | | | | | | | | | | | prevent deleted SOP's from sticking around | |||||
| | * | | Correct a logic error in attachment cleanup | Melanie Thielker | 2010-08-25 | 1 | -4/+9 | |
| | | | | ||||||
| | * | | Lock the attachment cleanup so it doesn't go into an endless deletion frenzy | Melanie Thielker | 2010-08-25 | 1 | -16/+20 | |
| | | | | ||||||
| | * | | Call the cleanup after saving attachment states, so that the attachments | Melanie Thielker | 2010-08-24 | 1 | -1/+3 | |
| | | | | | | | | | | | | | don't get killed before they can be saved | |||||
| | * | | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie Thielker | 2010-08-24 | 1 | -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 attachments | Melanie Thielker | 2010-08-24 | 1 | -0/+32 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -3/+9 | |
| | |\ \ | | |/ | ||||||
| | | * | minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+5 | |
| | | | | ||||||
| | | * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | Kick the user from the region in the circumstance that the TP home failed - ↵ | meta7 | 2010-08-30 | 1 | -2/+3 | |
| |/ / | | | | | | | ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable. | |||||
| * | | Add printing the default script engine name. Report real exceptions when | Melanie Thielker | 2010-08-22 | 1 | -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 disabled | Melanie Thielker | 2010-08-22 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 3 | -54/+58 | |
| |\ \ | |/ | ||||||
| | * | Unit test breakage fix. | Diva Canto | 2010-08-20 | 2 | -6/+11 | |
| | | | ||||||
| | * | Cleaned up a few more things related to incoming agents. | Diva Canto | 2010-08-20 | 1 | -45/+42 | |
| | | | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-20 | 1 | -25/+27 | |
| | |\ | ||||||
| | | * | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 1 | -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 Scene | Melanie | 2010-08-20 | 1 | -9/+54 | |
| | |/ | | | | | | | to make it more configurable. | |||||
| * | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie Thielker | 2010-08-20 | 1 | -8/+53 | |
| | | | | | | | | | to make it more configurable. | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-18 | 6 | -392/+30 | |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 5 | -390/+28 | |
| | |\ \ | | |/ | ||||||
| | | * | Updated the create_region command in the RemoteAdmin plugin to properly ↵ | randomhuman | 2010-08-13 | 1 | -39/+0 | |
| | | | | | | | | | | | | | support estates without seeking further input on the console. | |||||
| | | * | refactor: move binary statistics logging from scene into separate region module | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -110/+12 | |
| | | | | ||||||
| | | * | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -160/+1 | |
| | | | | ||||||
| | | * | Establish new Objects/BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -22/+1 | |
| | | | | | | | | | | | | | Move Scene.ObjectSaleInfo() to this | |||||
| | | * | refactor: move Scene.TerrainUnAcked() handling into TerrainModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -8/+0 | |
| | | | | ||||||
| | | * | refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵ | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -12/+1 | |
| | | | | | | | | | | | | | same name | |||||
| | | * | refactor: move more map tile generation code from scene to IWorldMapModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -27/+0 | |
| | | | | ||||||
| | | * | refactor: Use SOP.Flags rather than SOP.ObjectFlags | Justin Clark-Casey (justincc) | 2010-08-13 | 3 | -12/+12 | |
| | | | | ||||||
| | | * | File wants to be committed | Diva Canto | 2010-08-11 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-14 | 2 | -3/+10 | |
| | |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * | | | Fix a possible nullref in BestAvatarResponsiveness policy | Melanie Thielker | 2010-08-14 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Fix a nullref exception in the prioritizer | meta7 | 2010-08-12 | 1 | -1/+12 | |
| | |/ / |/| | | ||||||
| * | | | Add some console debug to help fix a threadlock issue. | meta7 | 2010-08-11 | 1 | -2/+9 | |
| | | | | ||||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-11 | 1 | -0/+2 | |
| |\ \ \ | |/ / | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |