From cd8cd8c265abb0c568ee7b925551023c8081c298 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 12 Apr 2013 09:26:59 -0700
Subject: [PATCH] Fix merge oddities
---
indra/llui/llkeywords.cpp | 1 -
indra/llui/lllayoutstack.cpp | 1 -
indra/llui/lltoolbar.cpp | 1 -
indra/lscript/lscript_execute/lscript_readlso.cpp | 2 --
4 files changed, 5 deletions(-)
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 5f9dbb33ad4..26d27d1f345 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 7115ad496ae..dff98f33b9c 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 5d0ac9eeb43..3d9f5cbbc23 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,
diff --git a/indra/lscript/lscript_execute/lscript_readlso.cpp b/indra/lscript/lscript_execute/lscript_readlso.cpp
index c88b43ed835..6384a571008 100644
--- a/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -145,7 +145,6 @@ void LLScriptLSOParse::printGlobals(LLFILE *fp)
// get offset to skip past name
varoffset = global_v_offset;
bytestream2integer(mRawData, global_v_offset);
- (void)offset; //hush little compiler
// get typeexport
type = *(mRawData + global_v_offset++);
@@ -355,7 +354,6 @@ void LLScriptLSOParse::printStates(LLFILE *fp)
{
temp_end = bytestream2integer(mRawData, read_ahead);
bytestream2integer(mRawData, read_ahead);
- (void)dummy;
if ( (temp_end < opcode_end)
&&(temp_end > event_offset))
{
--
GitLab