aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-291-1/+1
|\
| * Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| * Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-191-1/+1
* | Plumb a data path to initialize an attachment from an alternate sourceMelanie Thielker2010-04-241-2/+18
* | Add an additional serialization call do the detach procedure. This call isMelanie Thielker2010-04-231-0/+3
* | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-231-1/+2
* | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-191-1/+1
* | Remove the event trigger for the attach event from the attachment module.Melanie Thielker2010-04-191-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-192-12/+58
|\ \ | |/
| * All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-191-1/+2
| * refactor: move DeatchObject() into the AttachmentsModuleJustin Clark-Casey (justincc)2010-04-171-0/+10
| * refactor: crudely move DetachSingleAttachmentToGround() over to the Attachmen...Justin Clark-Casey (justincc)2010-04-161-0/+32
| * refactor: crudely move the RezMultipleAttachments() method into the Attachmen...Justin Clark-Casey (justincc)2010-04-161-0/+12
| * * Adds IAssetService.GetCached() to allow asset fetching from the local cache...John Hurliman2010-04-081-0/+220
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-0/+229
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-131-0/+229
| |\ \
| | * | Changed the GetTextureModule backport to work with the 0.6.9 codebaseJohn Hurliman2010-04-081-2/+11
| | * | Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-081-0/+220
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-062-10/+70
| |\ \ \ | | |/ /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-304-7/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | May fix mantis #4613Diva Canto2010-03-271-1/+2
| * | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene...Dan Lake2010-03-193-6/+6
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-183-65/+46
|\ \ \ \ | |/ / /
| * | | Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminati...Dan Lake2010-03-172-63/+44
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-151-0/+75
| |\ \ \
| * | | | * UuidGatherer now tracks asset types for assets it discovers. The asset type...John Hurliman2010-03-151-2/+2
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-153-9/+114
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | refactor: Move another RezSingleAttachment() from Scene.Inventory to Attachme...Justin Clark-Casey (justincc)2010-03-121-1/+30
| * | | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to Attachme...Justin Clark-Casey (justincc)2010-03-121-0/+46
| |/ / /
| * | | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModuleJustin Clark-Casey (justincc)2010-03-121-1/+31
| * | | Formatting cleanup. Add copyright notices.Jeff Ames2010-03-103-7/+7
| * | | Changed a cryptic debug message and a wrong commentDiva Canto2010-03-091-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-091-1/+25
|\ \ \ \ | |/ / /
| * | | - supporting llTextBoxunknown2010-03-061-1/+25
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-061-0/+257
|\ \ \ \ | |/ / /
| * | | refactor: Move DetachSingleAttachmentToInv to region moduleJustin Clark-Casey (justincc)2010-03-061-15/+56
| * | | refactor: move another AttachObject methodJustin Clark-Casey (justincc)2010-03-051-1/+46
| * | | refactor: move user inventory side of RezSingleAttachment to moduleJustin Clark-Casey (justincc)2010-03-051-0/+30
| * | | refactor: begin to move attachments code into a region moduleJustin Clark-Casey (justincc)2010-03-051-0/+141
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0318-2121/+1759
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Offline friendship offers now working.Diva Canto2010-03-011-8/+41
| * | Friends rights under control.Diva Canto2010-03-012-70/+33
| * | More work on GrantRights. Still not right.Diva Canto2010-03-012-44/+101
| * | Fix -1 checks for login caseMelanie2010-03-011-1/+1
| * | Small tweakMelanie2010-03-011-1/+1
| * | Should have things the right way around, better that wayMelanie2010-03-011-1/+1
| * | Change friends to handle offers as it was originally designed. This mayMelanie2010-03-011-6/+2
| * | Implement rights changes locall (UNTESTED)Melanie2010-02-281-10/+38
| * | Initial Online friends notification seems to be working reliably now. All thi...Diva Canto2010-02-281-16/+38
| * | Friends connectors finished. Status notification working across the board. On...Diva Canto2010-02-282-58/+282