Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion indra/llui/llsliderctrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,16 @@ void LLSliderCtrl::updateSliderRect()
}
if (mTextBox)
{
right -= mTextBox->getRect().getWidth() + sliderctrl_spacing;
// Keep the value text pinned to the right edge, the same way the
// editable variant above is; without this a resized slider leaves
// the text floating at its construction-time offset mid-track.
LLRect text_rect = mTextBox->getRect();
const S32 text_width = text_rect.getWidth();
text_rect.mRight = right;
text_rect.mLeft = right - text_width;
mTextBox->setRect(text_rect);

right -= text_width + sliderctrl_spacing;
}
if (mLabelBox)
{
Expand Down
11 changes: 11 additions & 0 deletions indra/newview/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,13 @@ set(viewer_SOURCE_FILES
alfloaterprofilelegacy.cpp
alfloaterprogressview.cpp
alfloaterregiontracker.cpp
alfloatersceneexplorer.cpp
alfloatersceneexplorerfilters.cpp
alfloatertransactionlog.cpp
alsceneexplorerpredicate.cpp
alfloaterwebprofile.cpp
allegacynotificationwellwindow.cpp
alobjectproperties.cpp
alpanelaomini.cpp
alpanelaopulldown.cpp
alpanelavatarlegacy.cpp
Expand All @@ -195,6 +199,7 @@ set(viewer_SOURCE_FILES
alpanelsearchweb.cpp
alpanelstreaminfo.cpp
alpickitem.cpp
alsceneexplorermodel.cpp
alstreaminfo.cpp
altoolalign.cpp
alunzip.cpp
Expand Down Expand Up @@ -932,9 +937,13 @@ set(viewer_HEADER_FILES
alfloaterprofilelegacy.h
alfloaterprogressview.h
alfloaterregiontracker.h
alfloatersceneexplorer.h
alfloatersceneexplorerfilters.h
alfloatertransactionlog.h
alsceneexplorerpredicate.h
alfloaterwebprofile.h
allegacynotificationwellwindow.h
alobjectproperties.h
alpanelaomini.h
alpanelaopulldown.h
alpanelavatarlegacy.h
Expand All @@ -957,6 +966,7 @@ set(viewer_HEADER_FILES
alpanelsearchweb.h
alpanelstreaminfo.h
alpickitem.h
alsceneexplorermodel.h
alstreaminfo.h
altoolalign.h
alunzip.h
Expand Down Expand Up @@ -2351,6 +2361,7 @@ if (BUILD_TESTING)
# This creates a separate test project per file listed.

SET(viewer_TEST_SOURCE_FILES
alsceneexplorerpredicate.cpp
llagentaccess.cpp
lldateutil.cpp
# llmediadataclient.cpp
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/alderenderlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ class ALDerenderList : public LLSingleton<ALDerenderList>
using entry_list_t = std::list<std::unique_ptr<ALDerenderEntry>>;

const entry_list_t& getEntries() const { return m_Entries; }
bool isDerendered(const LLUUID& idObject) { return getObjectEntry(idObject) != nullptr; }
void removeObject(ALDerenderEntry::EEntryType eType, const LLUUID& idObject);
void removeObjects(ALDerenderEntry::EEntryType eType, const uuid_vec_t& idsObject);
protected:
Expand All @@ -170,7 +171,6 @@ class ALDerenderList : public LLSingleton<ALDerenderList>
protected:
ALDerenderObject* getObjectEntry(const LLUUID& idObject) /*const*/;
ALDerenderObject* getObjectEntry(U64 idRegion, const LLUUID& idObject, U32 idRootLocal) /*const*/;
bool isDerendered(const LLUUID& idObject) /*const*/ { return getObjectEntry(idObject) != nullptr; }
bool isDerendered(U64 idRegion, const LLUUID& idObject, U32 idRootLocal) /*const*/ { return getObjectEntry(idRegion, idObject, idRootLocal) != nullptr; }

/*
Expand Down
Loading
Loading