aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* JustinCC's core re-mergeMelanie2013-01-161-3/+23
* Merge branch 'master' into careminsterMelanie2012-12-161-6/+4
|\
| * Switched the order by which foreign inventory and foreign assets are brought ...Diva Canto2012-12-091-6/+4
| * UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-111-2/+13
|\ \ | |/
| * Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() a...Justin Clark-Casey (justincc)2012-11-101-2/+13
* | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \
| * | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-10-171-0/+6
|\ \ \ | |/ /
| * | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-0/+6
* | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ \ | | |/ | |/|
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-4/+15
|\ \ \ | | |/ | |/|
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | |/ /
| * | Add the option to have variable costing for uploadsMelanie2012-09-111-2/+2
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-1/+1
|\ \ \ | | |/ | |/|
| * | Log initial script startup info notice when xengine actually starts to do thi...Justin Clark-Casey (justincc)2012-08-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-08-241-0/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-241-0/+3
* | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-231-0/+3
* | Fix group return stuffMelanie2012-08-211-1/+1
* | Merge branch 'master' into careminsterMelanie2012-08-031-1/+2
|\ \ | |/
| * refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,...Justin Clark-Casey (justincc)2012-08-031-1/+1
| * reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-021-1/+2
* | Merge branch 'master' into careminsterMelanie2012-07-281-23/+46
|\ \ | |/
| * When copying items, copy the item description field instead of the asset desc...Justin Clark-Casey (justincc)2012-07-261-23/+46
* | Merge branch 'master' into careminsterMelanie2012-07-161-14/+0
|\ \ | |/
| * Revert "Fix script "Running" behavior"Melanie2012-07-161-14/+0
* | Merge branch 'master' into careminsterMelanie2012-06-261-0/+14
|\ \ | |/
| * Fix script "Running" behaviorBlueWall2012-06-231-0/+14
* | Merge branch 'master' into careminsterMelanie2012-06-211-4/+17
|\ \ | |/
| * Log how many scripts are candidates for starting and how many are actually st...Justin Clark-Casey (justincc)2012-06-201-4/+17
* | Merge branch 'master' into careminsterMelanie2012-06-071-17/+12
|\ \ | |/
| * Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-071-17/+12
* | Merge branch 'master' into careminsterMelanie2012-05-271-5/+5
|\ \ | |/
| * minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-5/+5
* | Merge branch 'avination' into careminsterMelanie2012-05-141-1/+4
|\ \
| * | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
* | | Merge branch 'master' into careminsterMelanie2012-05-101-0/+4
|\ \ \ | |/ / |/| / | |/
| * Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-0/+4
| * Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-251-1/+1
* | Merge branch 'master' into careminsterMelanie2012-04-071-13/+68
|\ \ | |/
| * If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| * refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in M...Justin Clark-Casey (justincc)2012-03-221-11/+8
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-5/+5
|\ \ | |/
| * Fix llGiveInventory() so that it checks the destination part for AllowInvento...Justin Clark-Casey (justincc)2012-03-221-5/+5
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+1
|\ \ | |/
| * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+9
|\ \ | |/
generated by cgit v1.1 at 2024-10-23 09:34:54 +0000