diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:59:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:59:40 -0500 |
| commit | 667e5d196817dffa7eb68ec53dd02ac7a66d0ea2 (patch) | |
| tree | d81607c82abc142d0b747f8dd64dd1d0509bbdb4 | |
| parent | 9e9d32de384b2807f195be48f49fbdec725f45d1 (diff) | |
Merge cleanup
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llworld.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/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 fd0c6f8c3c..b86c453d61 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 fc6b959aa8..b061c90d98 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 2e29c61cb2..6021ba0a5a 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" |