Commit 48ecef50 authored by NiranV's avatar NiranV
Browse files

Fixed: Compile.

parent 2b93a002
......@@ -277,9 +277,9 @@ void LLSingletonBase::reset_initializing(list_t::size_type size)
void LLSingletonBase::MasterList::LockedInitializing::log(const char* verb, const char* name)
{
if (oktolog())
/*if (oktolog())
{
/* _LL_DEBUGS("LLSingleton") << verb << ' ' << demangle(name) << ';';
_LL_DEBUGS("LLSingleton") << verb << ' ' << demangle(name) << ';';
if (mList)
{
for (list_t::const_reverse_iterator ri(mList->rbegin()), rend(mList->rend());
......@@ -289,8 +289,8 @@ void LLSingletonBase::MasterList::LockedInitializing::log(const char* verb, cons
LL_CONT << ' ' << classname(sb);
}
}
LL_ENDL;*/
}
LL_ENDL;
}*/
}
void LLSingletonBase::capture_dependency()
......
......@@ -69,6 +69,7 @@
#include "lltooldraganddrop.h"
#include "llurlaction.h"
#include "llviewercontrol.h"
#include "llviewermenu.h"
#include "llvoiceclient.h"
#include "llweb.h"
......
......@@ -41,6 +41,7 @@ class LLMenuButton;
class LLTabContainer;
class LLNetMap;
class LLBlockList;
class LLMenuItemBranchGL;
class LLPanelPeople
: public LLPanel
......
......@@ -1207,7 +1207,7 @@ void LLPanelPlaces::updateVerbs()
mTeleportBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn && !is_pick_panel_visible && is_place_info_visible);
mShowOnMapBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn && !is_pick_panel_visible && is_place_info_visible);
mOverflowBtn->setVisible(is_place_info_visible && !is_create_landmark_visible && !isLandmarkEditModeOn && is_place_info_visible);
mEditBtn->setVisible(mPlaceInfoType == LANDMARK_INFO_TYPE && !isLandmarkEditModeOn && is_place_info_visible);
//mEditBtn->setVisible(mPlaceInfoType == LANDMARK_INFO_TYPE && !isLandmarkEditModeOn && is_place_info_visible);
mSaveBtn->setVisible(isLandmarkEditModeOn && is_place_info_visible);
mCancelBtn->setVisible(isLandmarkEditModeOn && is_place_info_visible);
mCloseBtn->setVisible(is_create_landmark_visible && !isLandmarkEditModeOn && is_place_info_visible);
......@@ -1217,7 +1217,7 @@ void LLPanelPlaces::updateVerbs()
getChild<LLLayoutPanel>("lp_options")->setVisible(show_options_btn);
getChild<LLLayoutPanel>("lp2")->setVisible(!show_options_btn);
mPlaceInfoBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos);
//mPlaceInfoBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos);
if (is_place_info_visible)
{
......
......@@ -98,7 +98,7 @@ bool LLSearchableUI::LLPanelData::hightlightAndHide(LLWString const &aFilter)
return bVisible;
}
void LLSearchableUI::PanelData::setNotHighlighted()
void LLSearchableUI::LLPanelData::setNotHighlighted()
{
for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr)
(*itr)->setNotHighlighted();
......@@ -107,7 +107,7 @@ void LLSearchableUI::PanelData::setNotHighlighted()
(*itr)->setNotHighlighted();
}
bool LLSearchableUI::LLTabContainerData::::hightlightAndHide(LLWString const &aFilter)
bool LLSearchableUI::LLTabContainerData::hightlightAndHide(LLWString const &aFilter)
{
for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr)
{
......
......@@ -490,16 +490,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
case LLAgent::TELEPORT_ARRIVING:
// Make the user wait while content "pre-caches"
{
F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / teleport_arrival_delay());
if( arrival_fraction > 1.f )
{
arrival_fraction = 1.f;
//LLFirstUse::useTeleport();
LL_INFOS("Teleport") << "arrival_fraction is " << arrival_fraction << " changing state to TELEPORT_NONE" << LL_ENDL;
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
}
//LLFirstUse::useTeleport();
LL_INFOS("Teleport") << " changing state to TELEPORT_NONE" << LL_ENDL;
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
gViewerWindow->setProgressPercent( arrival_fraction * 10.f + 90.f);
gViewerWindow->setProgressPercent(100.f);
gViewerWindow->setProgressString(message);
}
break;
......@@ -508,15 +503,9 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// Short delay when teleporting in the same sim (progress screen active but not shown - did not
// fall-through from TELEPORT_START)
{
if( gTeleportDisplayTimer.getElapsedTimeF32() > teleport_local_delay() )
{
//LLFirstUse::useTeleport();
LL_INFOS("Teleport") << "State is local and gTeleportDisplayTimer " << gTeleportDisplayTimer.getElapsedTimeF32()
<< " exceeds teleport_local_delete " << teleport_local_delay
<< "; setting state to TELEPORT_NONE"
<< LL_ENDL;
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
}
//LLFirstUse::useTeleport();
LL_INFOS("Teleport") << "setting state to TELEPORT_NONE" << LL_ENDL;
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
}
break;
......
......@@ -6409,14 +6409,8 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
continue;
}
LLVOAvatar * av = light->getAvatar();
if (av && (av->isTooComplex() || av->isInMuteList()))
{
// avatars that are already in the list will be removed by removeMutedAVsLights
continue;
}
//BD
LLVOAvatar * av = light->getAvatar();
if (light->isAttachment())
{
//BD
......@@ -6435,6 +6429,17 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
}
}
if (av && (av->isTooComplex() || av->isInMuteList()))
{
// avatars that are already in the list will be removed by removeMutedAVsLights
continue;
}
F32 dist = calc_light_dist(light, cam_pos, max_dist);
if (dist >= max_dist)
{
continue;
}
new_nearby_lights.insert(Light(drawable, dist, 0.f));
if (!LLPipeline::sRenderDeferred && new_nearby_lights.size() > (U32)MAX_LOCAL_LIGHTS)
{
......@@ -6590,12 +6595,12 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
}
//BD
LLVOAvatar* av = light->getAvatar();
if (light->isAttachment())
{
//BD
LLVOAvatar* avatar = light->getAvatarAncestor();
if ((!sRenderOtherAttachedLights && (avatar != gAgentAvatarp))
|| (!sRenderOwnAttachedLights && (avatar == gAgentAvatarp)))
if ((!sRenderOtherAttachedLights && (av != gAgentAvatarp))
|| (!sRenderOwnAttachedLights && (av == gAgentAvatarp)))
{
continue;
}
......
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