diff options
| author | simon <none@none> | 2013-04-12 09:26:59 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-12 09:26:59 -0700 |
| commit | cd8cd8c265abb0c568ee7b925551023c8081c298 (patch) | |
| tree | 6ff5a8eb20e17852e997777ea79f8314409b602d /indra/llui | |
| parent | e2836d99d8d1295c123a67bdc572ab9a36b6389f (diff) | |
Fix merge oddities
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llkeywords.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 5f9dbb33ad..26d27d1f34 100644 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -367,7 +367,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW const llwchar* base = wtext.c_str(); const llwchar* cur = base; - (void)line; while( *cur ) { if( *cur == '\n' || cur == base ) diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 7115ad496a..dff98f33b9 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -476,7 +476,6 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp) if (lp->mResizeBar == NULL) { LLResizeBar::Side side = (mOrientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM; - (void)resize_bar_rect; LLResizeBar::Params resize_params; resize_params.name("resize"); resize_params.resizing_view(lp); diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 5d0ac9eeb4..3d9f5cbbc2 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -838,7 +838,6 @@ void LLToolBar::draw() if (mDragAndDropTarget && !mButtonCommands.empty()) { LLRect caret_rect = caret->getRect(); - (void)toolbar_rect; if (getOrientation(mSideType) == LLLayoutStack::HORIZONTAL) { caret->setRect(LLRect(mDragx-caret_rect.getWidth()/2+1, |