summaryrefslogtreecommitdiff
path: root/indra/llui/lluiimage.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-07-14 20:57:32 -0700
committerRichard Linden <none@none>2011-07-14 20:57:32 -0700
commit7dd8dc8be61ec40e33c40b9b37b8f45335df25c4 (patch)
tree746f0633e8fb5cd17e4755e7b48e3ffc245bf83c /indra/llui/lluiimage.cpp
parentd668270c13fcad8ae6e0fdfdf063a16be6083243 (diff)
EXP-880 FIX Enable navigation chrome in search floater
fixed regression where profile window wasn't using requested size
Diffstat (limited to 'indra/llui/lluiimage.cpp')
-rw-r--r--indra/llui/lluiimage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index f37947a50b..1d9ce29ba9 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -172,15 +172,15 @@ namespace LLInitParam
}
}
- void ParamValue<LLUIImage*, TypeValues<LLUIImage*> >::updateBlockFromValue()
+ void ParamValue<LLUIImage*, TypeValues<LLUIImage*> >::updateBlockFromValue(bool make_block_authoritative)
{
if (getValue() == NULL)
{
- name.set("none", false);
+ name.set("none", make_block_authoritative);
}
else
{
- name.set(getValue()->getName(), false);
+ name.set(getValue()->getName(), make_block_authoritative);
}
}