aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Catch a nullrefroot2010-09-161-1/+2
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-143-18/+24
|\
| * Rename now protected method SetAttachmentInventoryStatus() to ↵Justin Clark-Casey (justincc)2010-09-131-4/+4
| | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory()
| * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-131-5/+13
| | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
| * If attachment fails (e.g. because asset wasn't found) then don't try to set ↵Justin Clark-Casey (justincc)2010-09-131-4/+2
| | | | | | | | | | | | attachment as shown in inventory Doing this results in a null reference exception
| * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-132-3/+5
| |
| * * Fixing length calculations for HTTP texture downloads (the end byte is ↵John Hurliman2010-09-131-4/+6
| | | | | | | | inclusive in Range: headers)
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1310-315/+274
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-129-74/+74
| |
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-1/+1
| |
| * Over a dozen thread safety fixes in FriendsModuleJohn Hurliman2010-09-091-167/+163
| |
| * * Changed 11 calls for session info to the more optimized API methodJohn Hurliman2010-09-082-71/+33
| |
| * Fix yet another cause of "Ghost attachments"Melanie Thielker2010-09-061-3/+12
| |
* | Fix yet another cause of "Ghost attachments"Melanie Thielker2010-09-061-3/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-053-6/+5
|\ \ | |/
| * Move code that allows llGiveInvetory() to move item into appropriate system ↵Justin Clark-Casey (justincc)2010-09-041-2/+1
| | | | | | | | | | | | | | 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-041-3/+3
| | | | | | | | 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 warningsJustin Clark-Casey (justincc)2010-09-031-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-16/+79
|\ \ | |/
| * refactor: move SOG.AttachToAgent() into AttachmentsModuleJustin Clark-Casey (justincc)2010-09-011-7/+74
| |
| * refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments ↵Justin Clark-Casey (justincc)2010-08-311-9/+5
| | | | | | | | rather than filter sp.Attachments list directly
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-305-53/+178
|\ \ | |/
| * 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-281-1/+1
| |
| * 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)
| * refactor: Make IAR tests set up standard iar for loadingJustin Clark-Casey (justincc)2010-08-271-44/+60
| |
| * refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵Justin Clark-Casey (justincc)2010-08-261-2/+58
| | | | | | | | since this appears to relate solely to attachments
| * refactor: break out attachment position change code in ↵Justin Clark-Casey (justincc)2010-08-261-1/+20
| | | | | | | | | | | | 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
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-1/+1
|\ \ | |/ | | | | 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-261-1/+1
| | | | | | | | conditions in linking and unlinking
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-233-11/+5
|\ \ | |/
| * Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-233-18/+17
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-223/+242
|\ \ | |/
| * Some code cleanup for console command alert.Marck2010-08-201-9/+43
| | | | | | | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-182-10/+11
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-131-3/+3
| |
| * refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵Justin Clark-Casey (justincc)2010-08-131-7/+8
| | | | | | | | same name
* | Fix the general alert message so it doesn't get sent to child agentsmeta72010-08-071-220/+223
| |
* | and another one...sacha2010-08-071-1/+1
| |
* | Clean the loo after use please !!!!!sacha2010-08-071-4/+4
| | | | | | | | | | No need to keep useless debug message ! Never heard of wasted cpucycle you darn kid !
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-1/+1
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-071-1/+1
| |\
| | * Remove old test classes that don't actually test anything not done elsewhereJustin Clark-Casey (justincc)2010-08-071-1/+1
| | | | | | | | | | | | Also comment out log4net line in InventoryArchiverTests
| * | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| |/
* | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-063-80/+134
|\ \ | |/
| * Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-043-80/+134
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| | * Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-303-83/+137
| | | | | | | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour