aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
* | Merge branch 'master' into careminsterMelanie2012-02-211-16/+2
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-11/+1
| * Revert "Fix:Cannot drag inventory from child prim into inventory http://opens...Justin Clark-Casey (justincc)2012-02-211-8/+4
* | Merge branch 'master' into careminsterMelanie2012-02-211-4/+8
|\ \ | |/
| * Fix:Cannot drag inventory from child prim into inventory http://opensimulator...PixelTomsen2012-02-211-4/+8
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+13
|\ \ | |/
| * Add new and updated script eventsRobert Adams2012-02-171-0/+12
| * Fix: Object owned by the group does not return to the last owner http://opens...PixelTomsen2012-02-161-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-101-0/+9
|\ \ | |/
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer per...Justin Clark-Casey (justincc)2012-02-101-0/+9
* | Merge branch 'master' into careminsterMelanie2012-02-091-2/+19
|\ \ | |/
| * Stop a scene object from attempting to link with itself (which results in an ...Justin Clark-Casey (justincc)2012-02-081-2/+19
* | Merge branch 'master' into careminsterMelanie2012-02-041-4/+19
|\ \ | |/
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if...Justin Clark-Casey (justincc)2012-02-041-20/+19
* | Merge branch 'master' into careminsterMelanie2012-01-281-2/+0
|\ \ | |/
| * Comment out xfer section in Scene.UpdateTaskInventory() which was causing spu...Justin Clark-Casey (justincc)2012-01-281-13/+20
* | Merge branch 'master' into careminsterMelanie2012-01-261-0/+11
|\ \ | |/
| * Add basic TestAddScript() regression testJustin Clark-Casey (justincc)2012-01-261-0/+11
* | Merge branch 'master' into careminsterMelanie2012-01-261-78/+104
|\ \ | |/
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento...Justin Clark-Casey (justincc)2012-01-261-20/+30
| * refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), R...Justin Clark-Casey (justincc)2012-01-251-79/+95
| * If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-16/+39
* | If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-5/+24
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-101-0/+4
* | Merge branch 'master' into careminsterMelanie2011-12-091-4/+6
|\ \ | |/
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that i...Justin Clark-Casey (justincc)2011-12-091-4/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-241-10/+3
|\ \ | |/
| * Stop an exception being thrown and a teleport/border cross failing if the des...Justin Clark-Casey (justincc)2011-11-221-10/+3
* | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-2/+5
|\ \ | |/
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-2/+5
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-9/+9
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-151-9/+9
* | Bring us up to date.Tom2011-09-141-2/+22
|\ \ | |/
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-091-2/+22
* | First set of merge fixesTom2011-09-071-9/+10
* | Resolve merge commits, stage 1Tom2011-09-041-26/+19
|\ \ | |/
generated by cgit v1.1 at 2024-11-19 09:34:47 +0000