summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp2
-rw-r--r--indra/newview/llfloatergodtools.cpp2
-rw-r--r--indra/newview/llmutelist.cpp2
-rw-r--r--indra/newview/llviewerassetstorage.cpp8
-rw-r--r--indra/newview/llviewerassetstorage.h8
-rw-r--r--indra/newview/llviewercontrol.cpp2
-rw-r--r--indra/newview/llviewermessage.cpp2
-rw-r--r--indra/newview/llviewerobject.cpp2
-rw-r--r--indra/newview/llvovolume.cpp6
-rw-r--r--indra/newview/llvovolume.h2
-rw-r--r--indra/newview/pipeline.cpp2
11 files changed, 19 insertions, 19 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 89d3428d9b..4ffd9198a2 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -286,7 +286,7 @@ extern void init_apple_menu(const char* product);
extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;
-extern BOOL gDebugGL;
+extern bool gDebugGL;
#if LL_DARWIN
extern bool gHiDPISupport;
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 4b22f7427b..24e7d8af04 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -1344,7 +1344,7 @@ void LLPanelRequestTools::sendRequest(const LLHost& host)
{
gXferManager->requestFile(std::string("terrain.raw"), std::string("terrain.raw"), LL_PATH_NONE,
host,
- FALSE,
+ false,
terrain_download_done,
NULL);
}
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index a7a7ed1b70..01763e4934 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -782,7 +782,7 @@ void LLMuteList::processMuteListUpdate(LLMessageSystem* msg, void**)
filename,
LL_PATH_CACHE,
msg->getSender(),
- TRUE, // make the remote file temporary.
+ true, // make the remote file temporary.
onFileMuteList,
(void**)local_filename_and_path,
LLXferManager::HIGH_PRIORITY);
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index aa9ff012c3..2c47ef0e32 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -361,8 +361,8 @@ void LLViewerAssetStorage::_queueDataRequest(
LLAssetType::EType atype,
LLGetAssetCallback callback,
void *user_data,
- BOOL duplicate,
- BOOL is_priority)
+ bool duplicate,
+ bool is_priority)
{
mCountRequests++;
queueRequestHttp(uuid, atype, callback, user_data, duplicate, is_priority);
@@ -373,8 +373,8 @@ void LLViewerAssetStorage::queueRequestHttp(
LLAssetType::EType atype,
LLGetAssetCallback callback,
void *user_data,
- BOOL duplicate,
- BOOL is_priority)
+ bool duplicate,
+ bool is_priority)
{
LL_DEBUGS("ViewerAsset") << "Request asset via HTTP " << uuid << " type " << LLAssetType::lookup(atype) << LL_ENDL;
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index c3719d0918..cc1854d496 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -70,15 +70,15 @@ protected:
LLAssetType::EType type,
LLGetAssetCallback callback,
void *user_data,
- BOOL duplicate,
- BOOL is_priority) override;
+ bool duplicate,
+ bool is_priority) override;
void queueRequestHttp(const LLUUID& uuid,
LLAssetType::EType type,
LLGetAssetCallback callback,
void *user_data,
- BOOL duplicate,
- BOOL is_priority);
+ bool duplicate,
+ bool is_priority);
void capsRecvForRegion(const LLUUID& region_id, std::string pumpname);
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 61cc1dee25..9b5719ea1c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -95,7 +95,7 @@ std::string gLastRunVersion;
extern BOOL gResizeScreenTexture;
extern BOOL gResizeShadowTexture;
-extern BOOL gDebugGL;
+extern bool gDebugGL;
////////////////////////////////////////////////////////////////////////////
// Listeners
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8bf69d54bd..cf14b59292 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6805,7 +6805,7 @@ void process_initiate_download(LLMessageSystem* msg, void**)
sim_filename,
LL_PATH_NONE,
msg->getSender(),
- FALSE, // don't delete remote
+ false, // don't delete remote
callback_download_complete,
(void**)new std::string(viewer_filename));
}
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index a0a9da5bec..1b7c668b7d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3186,7 +3186,7 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
U64 new_id = gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename),
ft->mFilename, LL_PATH_CACHE,
object->mRegionp->getHost(),
- TRUE,
+ true,
&LLViewerObject::processTaskInvFile,
(void**)ft, // This takes ownership of ft
LLXferManager::HIGH_PRIORITY);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0917a819d0..a91da62f80 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2140,13 +2140,13 @@ void LLVOVolume::updateFaceSize(S32 idx)
}
}
-BOOL LLVOVolume::isRootEdit() const
+bool LLVOVolume::isRootEdit() const
{
if (mParent && !((LLViewerObject*)mParent)->isAvatar())
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
//virtual
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index b65450a3f2..b8ccc26cad 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -134,7 +134,7 @@ public:
BOOL isVisible() const ;
BOOL isActive() const override;
BOOL isAttachment() const override;
- BOOL isRootEdit() const override; // overridden for sake of attachments treating themselves as a root object
+ bool isRootEdit() const override; // overridden for sake of attachments treating themselves as a root object
BOOL isHUDAttachment() const override;
void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 3a1edb0d00..7f83f17def 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -209,7 +209,7 @@ const U32 DEFERRED_VB_MASK = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TE
extern S32 gBoxFrame;
//extern BOOL gHideSelectedObjects;
extern BOOL gDisplaySwapBuffers;
-extern BOOL gDebugGL;
+extern bool gDebugGL;
extern BOOL gCubeSnapshot;
extern BOOL gSnapshotNoPost;