Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 11 | -72/+17 |
|\ | |||||
| * | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -13/+0 |
| | | | | | | | | on IDwellModule | ||||
| * | Move code that allows llGiveInvetory() to move item into appropriate system ↵ | Justin Clark-Casey (justincc) | 2010-09-04 | 6 | -60/+5 |
| | | | | | | | | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway. | ||||
| * | Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item) | Justin Clark-Casey (justincc) | 2010-09-04 | 2 | -6/+6 |
| | | | | | | | | The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated. | ||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -1/+1 |
| | | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-09-03 | 3 | -8/+8 |
| | | |||||
* | | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -13/+0 |
| | | | | | | | | on IDwellModule | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -16/+79 |
|\ \ | |/ | |||||
| * | refactor: move SOG.AttachToAgent() into AttachmentsModule | Justin Clark-Casey (justincc) | 2010-09-01 | 1 | -7/+74 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-01 | 1 | -1/+1 |
| |\ | |||||
| | * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | script state enum to reflect recent changes. | ||||
| * | | refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments ↵ | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -9/+5 |
| |/ | | | | | | | rather than filter sp.Attachments list directly | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-31 | 3 | -15/+38 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-30 | 23 | -1255/+1436 |
| |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Kick the user from the region in the circumstance that the TP home failed - ↵ | meta7 | 2010-08-30 | 3 | -15/+38 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | script state enum to reflect recent changes. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 12 | -431/+556 |
|\ \ \ | | |/ | |/| | |||||
| * | | Implements parcel media setting persistence and packet / CAPS handling | Jonathan Freedman | 2010-08-30 | 4 | -120/+90 |
| | | | | | | | | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -0/+9 |
| |\ \ | |||||
| | * | | Addresses mantis #4991 -- HG between two regions with the same map ↵ | Diva Canto | 2010-08-27 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | coordinates fails with no warning | ||||
| * | | | very minor log message and var name tweaking for iar saving | Justin Clark-Casey (justincc) | 2010-08-28 | 2 | -5/+8 |
| |/ / | |||||
| * | | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 3 | -286/+288 |
| | | | |||||
| * | | minor: reduce log chattiness of "load iar" for IARs with lots of folders | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -1/+1 |
| | | | |||||
| * | | allow inventory path specified in "load iar" to start with a / (e.g. ↵ | Justin Clark-Casey (justincc) | 2010-08-27 | 2 | -1/+33 |
| | | | | | | | | | | | | /Objects is now valid where it wasn't before) | ||||
| * | | refactor: Make IAR tests set up standard iar for loading | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -44/+60 |
| | | | |||||
| * | | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+58 |
| | | | | | | | | | | | | since this appears to relate solely to attachments | ||||
| * | | refactor: break out attachment position change code in ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions. | ||||
| * | | minor: change log message from info to debug | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+1 |
| | | | |||||
* | | | Remove CRLF endings | Melanie | 2010-08-30 | 1 | -1045/+1045 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 5 | -280/+289 |
|\ \ \ | |/ / | | | | | | | This was rather conflicted. Please test linking. | ||||
| * | | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 5 | -284/+296 |
| | | | | | | | | | | | | conditions in linking and unlinking | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 2 | -3/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -0/+1 |
| |\ \ | |||||
| * | | | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 2 | -3/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
* | | | | Call attachment cleanup when an agent crosses out | Melanie Thielker | 2010-08-24 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-24 | 1 | -0/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Plumb the region type through to the ProductName field in estate messages | Melanie | 2010-08-24 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 8 | -25/+51 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | 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. | ||||
| * | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 2 | -9/+18 |
| | | | | | | | | | | 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 | 7 | -23/+28 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 3 | -235/+254 |
|\ \ | |/ | |||||
| * | Forward-port a small improvement to the land out connector | Melanie Thielker | 2010-08-21 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 2 | -18/+52 |
| |\ | |||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-20 | 1 | -9/+9 |
| | | | |||||
| | * | Some code cleanup for console command alert. | Marck | 2010-08-20 | 1 | -9/+43 |
| | | | | | | | | | | | | | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts. | ||||
| * | | Unit test breakage fix. | Diva Canto | 2010-08-20 | 1 | -3/+3 |
| |/ | |||||
* | | Forward-port a small improvement to the land out connector | Melanie Thielker | 2010-08-21 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 19 | -99/+564 |
|\ \ | |/ | |||||
| * | * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵ | John Hurliman | 2010-08-17 | 1 | -1/+1 |
| | | | | | | | | to fix the build |