From 70495f6f2f61687717135f027c224003f5c5360a Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 5 Oct 2011 16:56:49 -0700
Subject: Fixing merge mistakes!

---
 indra/llui/lltoolbar.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/llui')

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;
 }
-- 
cgit v1.2.3