From 667e5d196817dffa7eb68ec53dd02ac7a66d0ea2 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 22 Jun 2012 14:59:40 -0500
Subject: [PATCH] Merge cleanup
---
indra/newview/llinventorybridge.cpp | 2 ++
indra/newview/llworld.cpp | 1 -
.../skins/default/xui/en/floater_texture_ctrl.xml | 10 ----------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index fd0c6f8c3cf..b86c453d617 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3008,6 +3008,8 @@ void LLFolderBridge::pasteFromClipboard()
}
}
+ const LLUUID parent_id(mUUID);
+
for (LLDynamicArray<LLUUID>::const_iterator iter = objects.begin();
iter != objects.end();
++iter)
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index fc6b959aa81..b061c90d98c 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1195,7 +1195,6 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
if (!uuid.isNull()
&& dist_vec_squared(pos_global, relative_to) <= radius_squared)
- dist_vec_squared(pos_global, relative_to) <= radius_squared)
{
if(positions != NULL)
{
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 2e29c61cb28..6021ba0a5ab 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -134,16 +134,6 @@
top_delta="-25"
name="Pipette"
width="28" />
- <check_box
- follows="left|bottom"
- height="20"
- initial_value="true"
- label="Live Preview"
- layout="topleft"
- left="4"
- name="apply_immediate_check"
- top="262"
- width="120" />
<text
follows="left|bottom"
height="20"
--
GitLab