diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-09 15:52:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-09 15:52:45 -0700 |
| commit | ec5ea33c8113a63e956c195ccf051b2a03979be9 (patch) | |
| tree | 035e4ac326165d48eb6dc5f454fa6bc65fcbc1b6 /indra/llui/llcommandmanager.h | |
| parent | 60c85dff83918876b23ab1ff1dfd336fc9dbc839 (diff) | |
EXP-1300 : drop tool animation. First shot. Works but still a bit hacky and with some bugs (tools can be duplicated at times).
Diffstat (limited to 'indra/llui/llcommandmanager.h')
| -rw-r--r-- | indra/llui/llcommandmanager.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h index 8f9f956ec7..fdad7cd1b5 100644 --- a/indra/llui/llcommandmanager.h +++ b/indra/llui/llcommandmanager.h @@ -50,6 +50,12 @@ public: {} }; + LLCommandId() + : mName("null command") + { + mUUID = LLUUID::generateNewID(mName); + } + LLCommandId(const std::string& name) : mName(name) { @@ -62,10 +68,9 @@ public: mUUID = LLUUID::generateNewID(p.name); } - LLCommandId(const LLUUID& uuid) - : mName(""), + LLCommandId(const std::string& name, const LLUUID& uuid) + : mName(name), mUUID(uuid) - { } |