From 69d4079e070ca08d1e362637d1d5f40d84caf0a0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 2 Feb 2018 11:40:48 +0100 Subject: [PATCH] Fix bool <-> BOOL I stumbled over --- indra/newview/llviewermenu.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 08aaf750e8..4e79cbf10e 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -10938,19 +10938,19 @@ void toggleTeleportHistory() // Toggle teleport history panel directly // export -BOOL enable_export_object() +bool enable_export_object() { - // for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin(); iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++) { LLSelectNode* node = *iter; LLViewerObject* obj = node->getObject(); if (obj || node) + { return gSavedSettings.getBOOL("FSEnableObjectExports"); + } } - return false; - // + return false; } class FSObjectExport : public view_listener_t @@ -10966,6 +10966,7 @@ class FSObjectExport : public view_listener_t } }; // + // class FSObjectExportCollada : public view_listener_t {