aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-031-1/+3
|\
| * HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ...Diva Canto2012-11-021-1/+3
* | Merge branch 'avination' into careminsterMelanie2012-09-271-29/+28
|\ \
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-1/+1
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-29/+28
* | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+0
|\ \ \ | | |/ | |/|
| * | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
* | | Merge branch 'master' into careminsterMelanie2012-09-243-101/+44
|\ \ \ | |/ /
| * | HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| * | Moved the small HGUuidGatherer class to the file where its parent class is. N...Diva Canto2012-09-212-74/+2
| * | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already do...Diva Canto2012-09-211-18/+24
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-2/+2
| |\ \
| | * | Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't b...Justin Clark-Casey (justincc)2012-09-211-2/+2
| * | | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |/ /
| * | More HG2.0: Added permission policies in HGAsset Service based on asset types...Diva Canto2012-09-201-15/+19
* | | Merge branch 'master' into careminsterMelanie2012-09-161-0/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Restarting to work on HGSuitcaseInventoryService: added the ability for the o...Diva Canto2012-09-131-0/+2
* | Merge branch 'master' into careminsterMelanie2012-07-281-2/+3
|\ \ | |/
| * When copying items, copy the item description field instead of the asset desc...Justin Clark-Casey (justincc)2012-07-261-2/+3
* | Merge branch 'master' into careminsterMelanie2012-06-071-1/+1
|\ \ | |/
| * Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-071-1/+1
* | Merge branch 'master' into careminsterMelanie2012-05-272-36/+47
|\ \ | |/
| * Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-251-3/+2
| * minor: Make log class names in InventoryAccessModule uniformJustin Clark-Casey (justincc)2012-05-231-10/+10
| * Fix bug where an avatar that had an object they owned attached through llAtta...Justin Clark-Casey (justincc)2012-05-231-23/+36
* | Merge branch 'master' into careminsterMelanie2012-05-021-3/+4
|\ \ | |/
| * Add regression test for teleporting between neighbouring regions on the same ...Justin Clark-Casey (justincc)2012-05-011-3/+4
* | Merge branch 'avination'Melanie2012-05-021-0/+7
|\ \
| * | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-021-0/+7
* | | Merge branch 'master' into careminsterMelanie2012-04-271-1/+1
|\ \ \ | |/ / |/| / | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-271-1/+1
* | Prevent objects rezzed in sim from being seen as attachments and becoming une...Melanie2012-04-171-0/+2
* | Merge branch 'master' into careminsterMelanie2012-04-072-7/+153
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-061-4/+4
| |\
| | * Rather than having a FromFolderID property on every single prim and only ever...Justin Clark-Casey (justincc)2012-04-071-3/+3
| | * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-071-1/+1
| * | Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-061-3/+149
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-311-0/+24
|\ \ | |/
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-0/+5
| * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
| * More on the freeze on HG inventory transfers: spawn a threadlet on the funct...Diva Canto2012-03-081-1/+1
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-041-0/+6
|\ \
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-3/+3
| * | Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
| * | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-261-0/+4
* | | Merge branch 'master' into careminsterMelanie2012-03-031-1/+1
|\ \ \ | |/ / |/| / | |/
| * HG: Remove async in posting assets to foreign grid. Mono hates concurrency th...Diva Canto2012-02-251-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+6
|\ \ | |/
| * minor formatting changes from last commit (4486n7d)Justin Clark-Casey (justincc)2012-02-161-4/+3