diff options
| author | callum_linden <none@none> | 2013-04-17 13:38:04 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-04-17 13:38:04 -0700 |
| commit | 88eff41649b13f00f636e54e093fd5b8becf5f8c (patch) | |
| tree | f099a81df2c66e9940aa85ad1f47cc982a5eecc1 /indra/newview/llpaneltopinfobar.cpp | |
| parent | 010c87788d5c698d6cfe5782ac02d9a3924124cf (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llpaneltopinfobar.cpp')
| -rw-r--r-- | indra/newview/llpaneltopinfobar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpaneltopinfobar.cpp b/indra/newview/llpaneltopinfobar.cpp index 1830086da2..9dd665198f 100644 --- a/indra/newview/llpaneltopinfobar.cpp +++ b/indra/newview/llpaneltopinfobar.cpp @@ -232,7 +232,7 @@ void LLPanelTopInfoBar::buildLocationString(std::string& loc_str, bool show_coor void LLPanelTopInfoBar::setParcelInfoText(const std::string& new_text) { LLRect old_rect = getRect(); - const LLFontGL* font = mParcelInfoText->getDefaultFont(); + const LLFontGL* font = mParcelInfoText->getFont(); S32 new_text_width = font->getWidth(new_text); mParcelInfoText->setText(new_text); @@ -417,11 +417,11 @@ void LLPanelTopInfoBar::onParcelIconClick(EParcelIcon icon) case SCRIPTS_ICON: { LLViewerRegion* region = gAgent.getRegion(); - if(region && region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS) + if(region && region->getRegionFlag(REGION_FLAGS_ESTATE_SKIP_SCRIPTS)) { LLNotificationsUtil::add("ScriptsStopped"); } - else if(region && region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS) + else if(region && region->getRegionFlag(REGION_FLAGS_SKIP_SCRIPTS)) { LLNotificationsUtil::add("ScriptsNotRunning"); } |