summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/integration_tests/llimage_libtest/llimage_libtest.cpp2
-rw-r--r--indra/integration_tests/llui_libtest/llui_libtest.cpp2
-rw-r--r--indra/llcommon/StackWalker.cpp2
-rw-r--r--indra/llrender/llrendertarget.h2
-rwxr-xr-xindra/llui/tests/llurlentry_stub.cpp8
-rw-r--r--indra/newview/llcallbacklist.cpp12
-rw-r--r--indra/newview/lleventnotifier.h2
-rw-r--r--indra/newview/llfloaterdirectory.h2
-rw-r--r--indra/newview/lllookshistorypanel.h2
-rw-r--r--indra/newview/llpaneldirland.cpp2
-rw-r--r--indra/newview/llpanelimcontrolpanel.h6
-rw-r--r--indra/newview/lltoolview.cpp6
-rw-r--r--indra/newview/llviewermedia.cpp8
-rw-r--r--indra/newview/tests/lldir_stub.cpp2
-rw-r--r--indra/newview/tests/llxmlrpclistener_test.cpp4
15 files changed, 31 insertions, 31 deletions
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index b82ced2f8d..85c5a8cdd4 100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
@@ -530,7 +530,7 @@ int main(int argc, char** argv)
}
else
{
- LLFastTimer::sMetricLog = TRUE;
+ LLFastTimer::sMetricLog = true;
LLFastTimer::sLogName = test_name;
arg += 1; // Skip that arg now we know it's a valid test name
if ((arg + 1) == argc) // Break out of the loop if we reach the end of the arg list
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index efb9c47a91..86783049cb 100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -187,7 +187,7 @@ void export_test_floaters()
LLXMLNodePtr output_node = new LLXMLNode();
LLFloater* floater = new LLFloater(LLSD());
floater->buildFromFile( filename,
- // FALSE, // don't open floater
+ // false, // don't open floater
output_node);
std::string out_filename = gDirUtilp->add(xui_dir, filename);
std::string::size_type extension_pos = out_filename.rfind(".xml");
diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp
index 77ae4db4bd..a281fe83f6 100644
--- a/indra/llcommon/StackWalker.cpp
+++ b/indra/llcommon/StackWalker.cpp
@@ -904,7 +904,7 @@ bool StackWalker::LoadModules()
SetLastError(ERROR_DLL_INIT_FAILED);
return false;
}
- if (m_modulesLoaded != FALSE)
+ if (m_modulesLoaded)
return true;
// Build the sym-path:
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h
index cd3290cf66..ea4c38d483 100644
--- a/indra/llrender/llrendertarget.h
+++ b/indra/llrender/llrendertarget.h
@@ -42,7 +42,7 @@
...
//allocate a 256x256 RGBA render target with depth buffer
- target.allocate(256,256,GL_RGBA,TRUE);
+ target.allocate(256,256,GL_RGBA,true);
//render to contents of offscreen buffer
target.bindTarget();
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 95d1586495..8277c23691 100755
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -50,16 +50,16 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& ag
//
// Stub implementation for LLCacheName
//
-BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
+bool LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
{
fullname = "Lynx Linden";
- return TRUE;
+ return true;
}
-BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
+bool LLCacheName::getGroupName(const LLUUID& id, std::string& group)
{
group = "My Group";
- return TRUE;
+ return true;
}
boost::signals2::connection LLCacheName::get(const LLUUID& id, bool is_group, const LLCacheNameCallback& callback)
diff --git a/indra/newview/llcallbacklist.cpp b/indra/newview/llcallbacklist.cpp
index c474f2885b..1e596624b9 100644
--- a/indra/newview/llcallbacklist.cpp
+++ b/indra/newview/llcallbacklist.cpp
@@ -70,33 +70,33 @@ void LLCallbackList::addFunction( callback_t func, void *data)
}
-BOOL LLCallbackList::containsFunction( callback_t func, void *data)
+bool LLCallbackList::containsFunction( callback_t func, void *data)
{
callback_pair_t t(func, data);
callback_list_t::iterator iter = std::find(mCallbackList.begin(), mCallbackList.end(), t);
if (iter != mCallbackList.end())
{
- return TRUE;
+ return true;
}
else
{
- return FALSE;
+ return false;
}
}
-BOOL LLCallbackList::deleteFunction( callback_t func, void *data)
+bool LLCallbackList::deleteFunction( callback_t func, void *data)
{
callback_pair_t t(func, data);
callback_list_t::iterator iter = std::find(mCallbackList.begin(), mCallbackList.end(), t);
if (iter != mCallbackList.end())
{
mCallbackList.erase(iter);
- return TRUE;
+ return true;
}
else
{
- return FALSE;
+ return false;
}
}
diff --git a/indra/newview/lleventnotifier.h b/indra/newview/lleventnotifier.h
index 2a9295129d..be96b7680f 100644
--- a/indra/newview/lleventnotifier.h
+++ b/indra/newview/lleventnotifier.h
@@ -47,7 +47,7 @@ struct LLEventInfo
std::string mSimName;
LLVector3d mPosGlobal;
F64 mUnixTime; // seconds from 1970
- BOOL mHasCover;
+ bool mHasCover;
U32 mCover;
U32 mEventFlags;
};
diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h
index de788443be..fb3b9975ed 100644
--- a/indra/newview/llfloaterdirectory.h
+++ b/indra/newview/llfloaterdirectory.h
@@ -76,6 +76,6 @@ private:
static LLFloaterDirectory *sInstance;
};
-//extern BOOL gDisplayEventHack;
+//extern bool gDisplayEventHack;
#endif // LL_LLDIRECTORYFLOATER_H
diff --git a/indra/newview/lllookshistorypanel.h b/indra/newview/lllookshistorypanel.h
index 6293de7170..0bcf511e89 100644
--- a/indra/newview/lllookshistorypanel.h
+++ b/indra/newview/lllookshistorypanel.h
@@ -40,7 +40,7 @@ public:
LLLooksHistoryPanel();
virtual ~LLLooksHistoryPanel();
- /*virtual*/ BOOL postBuild();
+ /*virtual*/ bool postBuild();
/*virtual*/ void onSearchEdit(const std::string& string);
/*virtual*/ void onShowOnMap();
/*virtual*/ void onLooks();
diff --git a/indra/newview/llpaneldirland.cpp b/indra/newview/llpaneldirland.cpp
index 53c58d8fa9..e2ef44a604 100644
--- a/indra/newview/llpaneldirland.cpp
+++ b/indra/newview/llpaneldirland.cpp
@@ -197,7 +197,7 @@ void LLPanelDirLand::performQuery()
if (list)
{
std::string sort_name = list->getSortColumnName();
- BOOL sort_asc = list->getSortAscending();
+ bool sort_asc = list->getSortAscending();
if (sort_name == "name")
{
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index c7f5263bec..2fdd409fdc 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -40,7 +40,7 @@ public:
mSessionId(LLUUID()) {};
~LLPanelChatControlPanel();
- virtual BOOL postBuild();
+ virtual bool postBuild();
virtual void setSessionId(const LLUUID& session_id);
const LLUUID& getSessionId() { return mSessionId; }
@@ -58,7 +58,7 @@ public:
LLPanelGroupControlPanel(const LLUUID& session_id);
~LLPanelGroupControlPanel();
- BOOL postBuild();
+ bool postBuild();
void setSessionId(const LLUUID& session_id);
/*virtual*/ void draw();
@@ -77,7 +77,7 @@ class LLPanelAdHocControlPanel : public LLPanelGroupControlPanel
public:
LLPanelAdHocControlPanel(const LLUUID& session_id);
- BOOL postBuild();
+ bool postBuild();
};
diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp
index 179aae1e02..cd1d90ea9e 100644
--- a/indra/newview/lltoolview.cpp
+++ b/indra/newview/lltoolview.cpp
@@ -109,8 +109,8 @@ LLToolView::~LLToolView()
// // Can optionally ignore panel
// if (contain->mPanel)
// {
-// contain->mPanel->setBackgroundVisible( FALSE );
-// contain->mPanel->setBorderVisible( FALSE );
+// contain->mPanel->setBackgroundVisible( false );
+// contain->mPanel->setBorderVisible( false );
// addChild(contain->mPanel);
// }
@@ -153,7 +153,7 @@ void LLToolView::draw()
iter != mContainList.end(); ++iter)
{
LLToolContainer* contain = *iter;
- BOOL state = (contain->mTool == selected);
+ bool state = (contain->mTool == selected);
contain->mButton->setToggleState( state );
if (contain->mPanel)
{
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 24560aa21d..071a66209b 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -3623,7 +3623,7 @@ LLViewerMediaImpl::canUndo() const
if (mMediaSource)
return mMediaSource->canUndo();
else
- return FALSE;
+ return false;
}
////////////////////////////////////////////////////////////////////////////////
@@ -3643,7 +3643,7 @@ LLViewerMediaImpl::canRedo() const
if (mMediaSource)
return mMediaSource->canRedo();
else
- return FALSE;
+ return false;
}
////////////////////////////////////////////////////////////////////////////////
@@ -3723,7 +3723,7 @@ LLViewerMediaImpl::canDoDelete() const
if (mMediaSource)
return mMediaSource->canDoDelete();
else
- return FALSE;
+ return false;
}
////////////////////////////////////////////////////////////////////////////////
@@ -3743,7 +3743,7 @@ LLViewerMediaImpl::canSelectAll() const
if (mMediaSource)
return mMediaSource->canSelectAll();
else
- return FALSE;
+ return false;
}
void LLViewerMediaImpl::setUpdated(bool updated)
diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp
index 5d9c2f718b..ff4a4daf6d 100644
--- a/indra/newview/tests/lldir_stub.cpp
+++ b/indra/newview/tests/lldir_stub.cpp
@@ -28,7 +28,7 @@
LLDir::LLDir() {}
LLDir::~LLDir() {}
-BOOL LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) { return true; }
+S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) { return 1; }
void LLDir::setChatLogsDir(const std::string &path) {}
void LLDir::setPerAccountChatLogsDir(const std::string &) {}
void LLDir::updatePerAccountChatLogsDir() {}
diff --git a/indra/newview/tests/llxmlrpclistener_test.cpp b/indra/newview/tests/llxmlrpclistener_test.cpp
index ee6281fc24..c77ce367c5 100644
--- a/indra/newview/tests/llxmlrpclistener_test.cpp
+++ b/indra/newview/tests/llxmlrpclistener_test.cpp
@@ -62,8 +62,8 @@ namespace tut
// These variables are required by machinery used by
// LLXMLRPCTransaction. The values reflect reality for this test
// executable; hopefully these values are correct.
- gSavedSettings.declareBOOL("BrowserProxyEnabled", FALSE, "", LLControlVariable::PERSIST_NO); // don't persist
- gSavedSettings.declareBOOL("NoVerifySSLCert", TRUE, "", LLControlVariable::PERSIST_NO); // don't persist
+ gSavedSettings.declareBOOL("BrowserProxyEnabled", false, "", LLControlVariable::PERSIST_NO); // don't persist
+ gSavedSettings.declareBOOL("NoVerifySSLCert", true, "", LLControlVariable::PERSIST_NO); // don't persist
}
// LLEventPump listener signature
generated by cgit v1.3 (git 2.53.0) at 2026-09-05 19:11:25 +0000