Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

These are things, I'm sleepy

Browse Source
This commit is contained in:
Liru Færs
2019-10-19 07:09:52 -04:00
parent 4043130f75
commit 0f28a1bd86
6 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/llmenugl.h
View File

@@ -897,6 +897,7 @@ public:
LLView*const getVisibleMenu() const; LLView*const getVisibleMenu() const;
virtual BOOL hasVisibleMenu() const {return getVisibleMenu() != NULL;} virtual BOOL hasVisibleMenu() const {return getVisibleMenu() != NULL;}
static LLMenuItemGL* getActivatedItem() { return static_cast<LLMenuItemGL*>(sItemLastSelectedHandle.get()); }
static void setActivatedItem(LLMenuItemGL* item); static void setActivatedItem(LLMenuItemGL* item);
// Need to detect if mouse-up after context menu spawn has moved. // Need to detect if mouse-up after context menu spawn has moved.

6
indra/newview/CMakeLists.txt
View File

@@ -1303,16 +1303,16 @@ if (WINDOWS)
set_source_files_properties(${viewer_RESOURCE_FILES} set_source_files_properties(${viewer_RESOURCE_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) PROPERTIES HEADER_FILE_ONLY TRUE)
set(viewer_RESOURCE_FILES
list(APPEND viewer_RESOURCE_FILES
${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
${viewer_RESOURCE_FILES}
) )
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
PROPERTIES COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/res" PROPERTIES COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/res"
) )
SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES}) source_group("Resource Files" FILES ${viewer_RESOURCE_FILES})
list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES}) list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})

3
indra/newview/llnameeditor.cpp
View File

@@ -108,6 +108,9 @@ LLXMLNodePtr LLNameEditor::getXML(bool save_children) const
LLXMLNodePtr node = LLLineEditor::getXML(); LLXMLNodePtr node = LLLineEditor::getXML();
node->setName(LL_NAME_EDITOR_TAG); node->setName(LL_NAME_EDITOR_TAG);
node->createChild("label", TRUE)->setStringValue(mInitialValue);
node->createChild("rlv_sensitive", TRUE)->setBoolValue(mRLVSensitive);
node->createChild("click_for_profile", TRUE)->setBoolValue(mClickForProfile);
return node; return node;
} }

19
indra/newview/llparticipantlist.cpp
View File

@@ -120,25 +120,6 @@ LLParticipantList::~LLParticipantList()
mAvatarListRefreshConnection.disconnect(); mAvatarListRefreshConnection.disconnect();
mAvatarListReturnConnection.disconnect(); mAvatarListReturnConnection.disconnect();
mAvatarListToggleIconsConnection.disconnect(); mAvatarListToggleIconsConnection.disconnect();
// It is possible Participant List will be re-created from LLCallFloater::onCurrentChannelChanged()
// See ticket EXT-3427
// hide menu before deleting it to stop enable and check handlers from triggering.
if(mParticipantListMenu && !LLApp::isExiting())
{
mParticipantListMenu->hide();
}
if (mParticipantListMenu)
{
delete mParticipantListMenu;
mParticipantListMenu = NULL;
}
mAvatarList->setContextMenu(NULL);
mAvatarList->setComparator(NULL);
delete mAvalineUpdater;
*/ */
} }

6
indra/newview/lltexturectrl.cpp
View File

@@ -75,7 +75,6 @@
// </edit> // </edit>
// tag: vaa emerald local_asset_browser [begin] // tag: vaa emerald local_asset_browser [begin]
//#include <boost/algorithm/cxx11/any_of.hpp>
#include "floaterlocalassetbrowse.h" #include "floaterlocalassetbrowse.h"
#include "llscrolllistctrl.h" #include "llscrolllistctrl.h"
#define LOCALLIST_COL_ID 1 #define LOCALLIST_COL_ID 1
@@ -298,10 +297,9 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
} }
/* TODO: Figure out how to select local asset if in use? /* TODO: Figure out how to select local asset if in use?
// tag: vaa emerald local_asset_browser [begin] // tag: vaa emerald local_asset_browser [begin]
else if (boost::algorithm::any_of_equal(mLocalScrollCtrl->getAllIDs(), mImageAssetID)) else if (mLocalScrollCtrl->selectByID(mImageAssetID))
{ {
tab = "local_tab"; tab = "local_tab";
mLocalScrollCtrl->selectByID(mImageAssetID);
} }
// tag: vaa emerald local_asset_browser [end] // tag: vaa emerald local_asset_browser [end]
*/ */
@@ -966,7 +964,7 @@ void LLFloaterTexturePicker::onBtnBrowser(void *userdata)
// reacts to user clicking a valid field in the local scroll list. // reacts to user clicking a valid field in the local scroll list.
void LLFloaterTexturePicker::onLocalScrollCommit() void LLFloaterTexturePicker::onLocalScrollCommit()
{ {
LLUUID id(mLocalScrollCtrl->getSelectedItemLabel(LOCALLIST_COL_ID)); LLUUID id(mLocalScrollCtrl->getStringUUIDSelectedItem());
mOwner->setImageAssetID(id); mOwner->setImageAssetID(id);
if (childGetValue("apply_immediate_check").asBoolean()) if (childGetValue("apply_immediate_check").asBoolean())

6
indra/newview/res/viewerRes.rc.in
View File

@@ -2,12 +2,6 @@
// //
#include "resource.h" #include "resource.h"
#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC (-1)
#include "winresrc.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //