diff options
| author | Jonathan Yap <none@none> | 2013-11-20 10:21:41 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-20 10:21:41 -0500 |
| commit | 176901422f0122dad8d1e4e423d0bc19e9e4ad8a (patch) | |
| tree | 5cd1203283d78411f1741953f8fe4661514e8795 /indra/newview/llviewerinventory.h | |
| parent | 0031e9a97be1bf6e9fe773c23506494d09ce91ae (diff) | |
STORM-68 Reapply changes to inventory processing lost in the merge.
Move call to updateCap back to where it was. The place it was moved
to was too early in the login sequence and was causing a crash.
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rwxr-xr-x | indra/newview/llviewerinventory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index ab19a12014..dc2fdb8c8d 100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -249,7 +249,9 @@ void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachme void activate_gesture_cb(const LLUUID& inv_item); +void create_script_cb(const LLUUID& inv_item); void create_gesture_cb(const LLUUID& inv_item); +void create_notecard_cb(const LLUUID& inv_item); class AddFavoriteLandmarkCallback : public LLInventoryCallback { |