diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
| commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
| tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/newview/llfloatergesture.cpp | |
| parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
| parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llfloatergesture.cpp')
| -rw-r--r-- | indra/newview/llfloatergesture.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp index bf03412696..0aca12bc5e 100644 --- a/indra/newview/llfloatergesture.cpp +++ b/indra/newview/llfloatergesture.cpp @@ -36,6 +36,7 @@ #include "llinventory.h" #include "llinventorybridge.h" +#include "llinventoryfunctions.h" #include "llinventorymodel.h" #include "llinventoryclipboard.h" @@ -354,10 +355,10 @@ void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gestur element["columns"][0]["value"] = ""; element["columns"][0]["font"]["name"] = "SANSSERIF"; element["columns"][0]["font"]["style"] = font_style; - element["columns"][0]["column"] = "trigger"; - element["columns"][0]["value"] = "---"; - element["columns"][0]["font"]["name"] = "SANSSERIF"; - element["columns"][0]["font"]["style"] = font_style; + element["columns"][1]["column"] = "shortcut"; + element["columns"][1]["value"] = "---"; + element["columns"][1]["font"]["name"] = "SANSSERIF"; + element["columns"][1]["font"]["style"] = font_style; element["columns"][2]["column"] = "key"; element["columns"][2]["value"] = "~~~"; element["columns"][2]["font"]["name"] = "SANSSERIF"; |