diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-03 18:58:49 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-03 18:58:49 -0700 |
| commit | 3b0f88918cbd25bf32b4798a4948770f92b7c73c (patch) | |
| tree | 55ab1ced4b03823b6f83600086fd16b4ed1b72f8 | |
| parent | 1cff73e807018b8c258285f5b8dcc90e66e17955 (diff) | |
| parent | 3689995fcfca3a99038b2aadec638819a63a02c8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 71f4e09a24..efa077ffa1 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -570,7 +570,7 @@ LLToolBarButton::LLToolBarButton(const Params& p) mDesiredHeight(p.desired_height), mId("") { - mUUID = LLUUID::LLUUID::generateNewID(p.name); + mUUID = LLUUID::generateNewID(p.name); } BOOL LLToolBarButton::handleMouseDown(S32 x, S32 y, MASK mask) |