diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-10 17:09:31 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-10 17:09:31 -0700 |
| commit | 5b1301ea8a0e50f2d15700a7e93be7628f6feec8 (patch) | |
| tree | f536cbca14fa0cd81d75e7d354bd75b370c18091 /indra/llui/llcommandmanager.h | |
| parent | fd03ae299bfaf83789e511912d99d204c0833e7f (diff) | |
| parent | 2d1431b2f0bb903be9259cbcae630f605d9c208c (diff) | |
merge
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) - { } |