diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:56:49 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:56:49 -0700 |
| commit | 70495f6f2f61687717135f027c224003f5c5360a (patch) | |
| tree | fbb763903586a64886354c2a1fc86367eb68243e | |
| parent | d8489166645f2e3ea7edd252997f9f48aa0871c3 (diff) | |
Fixing merge mistakes!
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 62217a664a..392e26f496 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -712,8 +712,6 @@ LLToolBarButton::LLToolBarButton(const Params& p) mIsRunningSignal(NULL), mIsStartingSignal(NULL) { - mUUID = LLUUID::generateNewID(p.name); - mButtonFlashRate = 0.0; mButtonFlashCount = 0; } |