| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 23 | -607/+1277 |
| |\ | | | | | | | This was rather conflicted. Please test linking. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 3 | -31/+47 |
| | |\ | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | * | | Remove parts locking from data classes since these are using a copy of the ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 4 | -168/+155 |
| | | | | | | | | | | | | | scene object | ||||
| | * | | 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 | 23 | -741/+906 |
| | | | | | | | | | | | | | conditions in linking and unlinking | ||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -3/+1 |
| | | | | |||||
| | * | | 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 | 3 | -55/+82 |
| | | | | | | | | | | | | | SceneObjectPartInventory | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 15 | -107/+320 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief. | ||||
| | * | | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 2 | -18/+29 |
| | | | | | | | | | | | | | sticking around | ||||
| | * | | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | |/ | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
| | * | Typo | Diva Canto | 2010-08-24 | 1 | -1/+1 |
| | | | |||||
| | * | 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 | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-24 | 4 | -11/+22 |
| | |\ | |||||
| | * | | 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 | 11 | -32/+170 |
| | | | | | | | | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
| * | | | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief. | ||||
| * | | | 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 | ||||
| * | | | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
| * | | | 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 |
| | | | | |||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-08-24 | 2 | -0/+39 |
| |\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | 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 | ||||
| | * | | | Call attachment cleanup when an agent crosses out | Melanie Thielker | 2010-08-24 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | 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-24 | 1 | -8/+17 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| | * | | Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for ↵ | Marck | 2010-08-24 | 1 | -8/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | attachments. This fixes Mantis #3923. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-24 | 3 | -3/+5 |
| |\ \ \ | |/ / | |||||
| | * | | Plumb the region type through to the ProductName field in estate messages | Melanie | 2010-08-24 | 3 | -3/+5 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 22 | -287/+126 |
| |\ \ | |/ | |||||
| | * | Add system lookup folder fix to the RemoveXInventoryServiceConnector as well ↵ | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -0/+17 |
| | | | | | | | | | since this presumably suffers from the same problem. | ||||
| | * | minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+5 |
| | | | |||||
| | * | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 5 | -16/+38 |
| | | | | | | | | | | | This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02 | ||||
| | * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 17 | -79/+78 |
| | | | |||||
| | * | Correct a minor typo | Melanie | 2010-08-21 | 1 | -1/+1 |
| | | | |||||
| | * | Finally putting estate_settings.xml to rest. There will be no more attempts | Melanie | 2010-08-21 | 1 | -198/+0 |
| | | | | | | | | | to read or write this file. | ||||
| | * | Don't allow oversized search reply packets | Melanie Thielker | 2010-08-21 | 1 | -17/+42 |
| | | | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-22 | 4 | -51/+136 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | Refix the fix | Melanie Thielker | 2010-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Provide a better implementation of llList2Float | Melanie Thielker | 2010-08-22 | 1 | -1/+14 |
| | | | | |||||
| | * | | Revert "Fix a typecasting issue in llList2Float. This addresses mantis #262" | Melanie Thielker | 2010-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 810840b8624886a615f303baf74f7b72fb1ca66a. This breaks llList2Float in horrible ways. 12 hours 14 minutes becomes 1214.0 and 023.145 becomes 23145.0 Could just add the dot to fix the latter issue but that would not help the first part. Another solution is needed. | ||||
| | * | | 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 |
| | | | | |||||
| | * | | A stab at making a better bounding box calculation | Melanie Thielker | 2010-08-22 | 1 | -31/+74 |
| | | | | |||||
| | * | | Don't allow oversized search reply packets | Melanie Thielker | 2010-08-21 | 1 | -17/+42 |
| | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |