diff options
| author | Richard Linden <none@none> | 2014-06-17 10:34:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-06-17 10:34:24 -0700 |
| commit | ff325bd7ae90d3205b35c7a8e894714c0fad45ba (patch) | |
| tree | 44c946a857a5a8e01bf19b30e94e5bfa8d93f443 /indra | |
| parent | ee14005a2aea89b2988fa0a5060f38b669e45389 (diff) | |
| parent | 2834c7968de9efc81d3c7db8a9c2b5cd2f16d6a3 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/lltooltip.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 20 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_group_invite.xml | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 5e1f12996e..7f2224870d 100755 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -477,7 +477,8 @@ void LLToolTipMgr::show(const std::string& msg) void LLToolTipMgr::show(const LLToolTip::Params& params) { if (!params.styled_message.isProvided() - && (!params.message.isProvided() || params.message().empty())) return; + && (!params.message.isProvided() || params.message().empty()) + && !params.image.isProvided()) return; // fill in default tooltip params from tool_tip.xml LLToolTip::Params params_with_defaults(params); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8d3a7327b9..c5d7689b95 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6129,16 +6129,16 @@ <integer>0</integer> </map> <key>MemoryLogFrequency</key> - <map> - <key>Comment</key> - <string>Seconds between display of Memory in log (0 for never)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>600.0</real> - </map> + <map> + <key>Comment</key> + <string>Seconds between display of Memory in log (0 for never)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>30.0</real> + </map> <key>MemoryPrivatePoolEnabled</key> <map> <key>Comment</key> diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 944a496fba..ebb460deb0 100755 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -76,7 +76,7 @@ Choose what Role to assign them to: </text> <combo_box - height="16" + height="20" layout="topleft" left_delta="0" name="role_name" |