Commit 1d205c52 authored by NiranV's avatar NiranV
Browse files

Fixed: Compile.

--HG--
branch : Black Dragon
parent 92ee5da2
......@@ -286,7 +286,7 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask)
{
S32 mouse_x_warp = 0;
S32 mouse_y_warp = 0;
LLUI::getMousePositionScreen(&mouse_x_warp, &mouse_y_warp);
LLUI::getInstance()->getMousePositionScreen(&mouse_x_warp, &mouse_y_warp);
if (mOrientation == HORIZONTAL)
{
......@@ -297,7 +297,7 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask)
mouse_y_warp += mMouseOffset;
}
LLUI::setMousePositionScreen(mouse_x_warp, mouse_y_warp);
LLUI::getInstance()->setMousePositionScreen(mouse_x_warp, mouse_y_warp);
mMouseOffset = 0;
}
......
......@@ -160,7 +160,7 @@ void LLFloaterDisplayName::onCancel()
void LLFloaterDisplayName::onReset()
{
if (LLAvatarNameCache::hasNameLookupURL())
if (LLAvatarNameCache::getInstance()->hasNameLookupURL())
{
LLViewerDisplayName::set("",boost::bind(&LLFloaterDisplayName::onCacheSetName, this, _1, _2, _3));
}
......@@ -194,7 +194,7 @@ void LLFloaterDisplayName::onSave()
return;
}
if (LLAvatarNameCache::hasNameLookupURL())
if (LLAvatarNameCache::getInstance()->hasNameLookupURL())
{
LLViewerDisplayName::set(display_name_utf8,boost::bind(&LLFloaterDisplayName::onCacheSetName, this, _1, _2, _3));
}
......
......@@ -186,7 +186,7 @@ public:
if (verb == "pay")
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarPay"))
if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableAvatarPay"))
{
LLNotificationsUtil::add("NoAvatarPay", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
......@@ -271,7 +271,7 @@ public:
bool handle(const LLSD& params, const LLSD& query_map,
LLMediaCtrl* web)
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks"))
if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnablePicks"))
{
LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
......@@ -322,7 +322,7 @@ public:
bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds"))
if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableClassifieds"))
{
LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
......
......@@ -483,8 +483,8 @@ void LLStatusBar::onMouseEnterDrawDistance()
// show the draw distance pull-down
mPanelDrawDistance->setShape(draw_distance_rect);
LLUI::clearPopups();
LLUI::addPopup(mPanelDrawDistance);
LLUI::getInstance()->clearPopups();
LLUI::getInstance()->addPopup(mPanelDrawDistance);
mPanelNearByMedia->setVisible(FALSE);
mPanelVolumePulldown->setVisible(FALSE);
......
......@@ -576,7 +576,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
}
}
gViewerWindow->hideCursor();
LLUI::setMousePositionScreen(mMouseRightUpX, mMouseRightUpY);
LLUI::getInstance()->setMousePositionScreen(mMouseRightUpX, mMouseRightUpY);
}
}
......
......@@ -148,7 +148,7 @@ public:
{
LLUUID agent_id = gAgent.getID();
// Flush stale data
LLAvatarNameCache::erase( agent_id );
LLAvatarNameCache::getInstance()->erase(agent_id);
// Queue request for new data: nothing to do on callback though...
// Note: no need to disconnect the callback as it never gets out of scope
LLAvatarNameCache::get(agent_id, boost::bind(&LLViewerDisplayName::doNothing));
......@@ -190,9 +190,9 @@ class LLDisplayNameUpdate : public LLHTTPNode
//LLSD headers = response->mHeaders;
LLSD headers;
av_name.mExpires =
LLAvatarNameCache::nameExpirationFromHeaders(headers);
LLAvatarNameCache::getInstance()->nameExpirationFromHeaders(headers);
LLAvatarNameCache::insert(agent_id, av_name);
LLAvatarNameCache::getInstance()->insert(agent_id, av_name);
// force name tag to update
LLVOAvatar::invalidateNameTag(agent_id);
......
......@@ -141,7 +141,7 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
}
// move the mouse pointer into the center of the menu
LLUI::setMousePositionLocal(getParent(), x, y);
LLUI::getInstance()->setMousePositionLocal(getParent(), x, y);
//BD - Set our drawing origin to the center of the menu
// Don't take UI Size into account, it breaks the selection area.
setOrigin(x - PIE_OUTER_SIZE, y - PIE_OUTER_SIZE);
......@@ -244,7 +244,7 @@ void PieMenu::draw()
// get the current mouse pointer position local to the pie
S32 x, y;
LLUI::getMousePositionLocal(this, &x, &y);
LLUI::getInstance()->getMousePositionLocal(this, &x, &y);
//BD - move mouse coordinates to be relative to the pie center
// Don't take UI size into account, it breaks the selection area.
LLVector2 mouseVector(x - PIE_OUTER_SIZE, y - PIE_OUTER_SIZE);
......
......@@ -2043,12 +2043,12 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNAMES>::onCommandToggle(ERlvBehaviou
// Force the use of the "display name" cache so we can filter both display and legacy names (or return back to the user's preference)
if (fHasBhvr)
{
LLAvatarNameCache::setForceDisplayNames(true);
LLAvatarNameCache::getInstance()->setForceDisplayNames(true);
}
else
{
LLAvatarNameCache::setForceDisplayNames(false);
LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames"));
LLAvatarNameCache::getInstance()->setForceDisplayNames(false);
LLAvatarNameCache::getInstance()->setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames"));
}
// Refresh all name tags and HUD text
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment