diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-30 13:15:36 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-30 13:15:36 +0100 |
commit | 61774546f0b260c18c5308143a9c3d02a5e5245e (patch) | |
tree | 4566b4f91c2e02956143647067ae642570bb907a /indra/newview/llfloatergesture.h | |
parent | ccd5b9e2f3f1139814a63d9db03c3671c249930c (diff) | |
parent | e1517318c58d6796b5566d5cf96c02474fd7376e (diff) |
HUGE merge from viewer-trunk. Many conflicts resolved.
Diffstat (limited to 'indra/newview/llfloatergesture.h')
-rw-r--r-- | indra/newview/llfloatergesture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h index 629d77b949..1676542c77 100644 --- a/indra/newview/llfloatergesture.h +++ b/indra/newview/llfloatergesture.h @@ -85,7 +85,7 @@ private: * Therefore we have to copy these items to avoid viewer crash. * @see LLFloaterGesture::onActivateBtnClick */ - void getSelectedIds(std::vector<LLUUID>& ids); + void getSelectedIds(uuid_vec_t& ids); bool isActionEnabled(const LLSD& command); /** * @brief Activation rules: |