 Melanie
|
65f5f60317
Merge branch 'master' into careminster
|
12 years ago |
 Justin Clark-Casey (justincc)
|
cf9b3e7708
Restore the taskItem null check that I accidentally blatted in 5397a6d
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
5397a6d4c6
Fix problem with dragging child part inventory item to user inventory.
|
12 years ago |
|
Melanie
|
24a49011cb
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569"
|
12 years ago |
 PixelTomsen
|
15ce73caca
Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569
|
12 years ago |
|
Melanie
|
dede31174e
Merge branch 'master' into careminster
|
12 years ago |
|
Melanie
|
985526b662
Merge branch 'master' into careminster
|
12 years ago |
 Robert Adams
|
6baa13ab7a
Add new and updated script events
|
12 years ago |
|
PixelTomsen
|
4486b7d8e8
Fix: Object owned by the group does not return to the last owner http://opensimulator.org/mantis/view.php?id=5404
|
12 years ago |
|
Melanie
|
215acbcc96
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
|
12 years ago |
|
Melanie
|
7c888f6af1
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
|
12 years ago |
|
Melanie
|
ce5e900721
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
9b762a5a84
Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if we have been passed a non-zero transaction ID.
|
12 years ago |
|
Melanie
|
abffda269f
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
deeb7287a2
Comment out xfer section in Scene.UpdateTaskInventory() which was causing spurious errors and "script saved" messages when script properties were changed.
|
12 years ago |
|
Melanie
|
a537f7e1a3
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
093469c33c
Add basic TestAddScript() regression test
|
12 years ago |
|
Melanie
|
4ce42762ee
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
55c6cbabfd
refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInventoryItem() to accept an agent id rather than a full IClientAPI.
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
2de3a1b9da
refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim()
|
12 years ago |
|
Melanie
|
f8c15d38a6
If dragging a script that is no copy from prim inventory into agent
|
12 years ago |
|
Melanie
|
31dc5aa728
If dragging a script that is no copy from prim inventory into agent
|
12 years ago |
|
Melanie
|
db98698bbe
Prevent spurious error message when client tries to move a null item
|
12 years ago |
|
Melanie
|
5f6a4c4111
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
94c242f792
Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found.
|
12 years ago |
|
Melanie
|
a8270cb48c
Merge branch 'master' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
|
13 years ago |
