aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-7/+3
|\
| * Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-172-33/+83
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-7/+3
* | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-172-33/+83
* | Catch a nullrefroot2010-09-161-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-143-18/+24
|\ \ | |/
| * Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUse...Justin Clark-Casey (justincc)2010-09-131-4/+4
| * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-131-5/+13
| * If attachment fails (e.g. because asset wasn't found) then don't try to set a...Justin Clark-Casey (justincc)2010-09-131-4/+2
| * 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 incl...John Hurliman2010-09-131-4/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1310-315/+274
|\ \ | |/
| * 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 f...Justin Clark-Casey (justincc)2010-09-041-2/+1
| * Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)Justin Clark-Casey (justincc)2010-09-041-3/+3
| * 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 rath...Justin Clark-Casey (justincc)2010-08-311-9/+5
* | 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. /Objects...Justin Clark-Casey (justincc)2010-08-272-1/+33
| * 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 sinc...Justin Clark-Casey (justincc)2010-08-261-2/+58
| * refactor: break out attachment position change code in Scene.UpdatePrimPositi...Justin Clark-Casey (justincc)2010-08-261-1/+20
| * 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
|\ \ | |/
| * Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-261-1/+1
* | 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
* | 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 s...Justin Clark-Casey (justincc)2010-08-131-7/+8
* | 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
* | 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
| * | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| |/