livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/llagent.cpp
#	indra/newview/llagent.h
#	indra/newview/llagentcamera.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llattachmentsmgr.cpp
#	indra/newview/llattachmentsmgr.h
#	indra/newview/llavataractions.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llcompilequeue.cpp
#	indra/newview/llcontrolavatar.h
#	indra/newview/lldirpicker.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolalpha.h
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfloateravatarpicker.cpp
#	indra/newview/llfloaterbeacons.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llfloaterdisplayname.cpp
#	indra/newview/llfloatergotoline.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llfloaterscriptdebug.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llfloatertools.cpp
#	indra/newview/llfloatertools.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llhudeffectlookat.cpp
#	indra/newview/llhudeffectlookat.h
#	indra/newview/llhudicon.cpp
#	indra/newview/llhudmanager.cpp
#	indra/newview/llhudtext.cpp
#	indra/newview/llhudtext.h
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllogininstance.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llmodelpreview.h
#	indra/newview/llmutelist.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/llnetmap.h
#	indra/newview/llnotificationlistitem.cpp
#	indra/newview/lloutputmonitorctrl.cpp
#	indra/newview/llpanelcontents.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelexperiencepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroupnotices.cpp
#	indra/newview/llpanelgrouproles.cpp
#	indra/newview/llpanellandaudio.cpp
#	indra/newview/llpanellandmarks.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelobject.cpp
#	indra/newview/llpanelobject.h
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaces.cpp
#	indra/newview/llpanelpresetspulldown.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelsnapshot.h
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llpreviewanim.cpp
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llpreviewnotecard.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llpreviewtexture.cpp
#	indra/newview/llpreviewtexture.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsnapshotlivepreview.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llstatusbar.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturecache.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltoastimpanel.cpp
#	indra/newview/lltoolbarview.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.cpp
#	indra/newview/lltoolgrab.cpp
#	indra/newview/lltoolgun.cpp
#	indra/newview/lltoolgun.h
#	indra/newview/lltoolpie.cpp
#	indra/newview/lltoolplacer.cpp
#	indra/newview/lltoolselect.cpp
#	indra/newview/lluploaddialog.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerfoldertype.cpp
#	indra/newview/llviewerinput.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewerobjectlist.h
#	indra/newview/llviewerparcelmgr.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexlayer.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvosky.cpp
#	indra/newview/llvosurfacepatch.cpp
#	indra/newview/llvotree.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/llvowater.cpp
#	indra/newview/llworld.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/llworldmipmap.cpp
#	indra/newview/pipeline.cpp
master
Ansariel 2024-02-22 11:43:04 +01:00
parent f51dcc3a9d 7704c26354
commit b71c7f37ea
792 changed files with 13247 additions and 13246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llcommon/llstring.cpp
View File

@ -837,7 +837,7 @@ std::wstring windows_message<std::wstring>(DWORD error)
return out.str();
}
boost::optional<std::wstring> llstring_getoptenv(const std::string& key)
std::optional<std::wstring> llstring_getoptenv(const std::string& key)
{
auto wkey = ll_convert_string_to_wide(key);
// Take a wild guess as to how big the buffer should be.
@ -855,8 +855,8 @@ boost::optional<std::wstring> llstring_getoptenv(const std::string& key)
// did that (ultimately) succeed?
if (n)
{
// great, return populated boost::optional
return boost::optional<std::wstring>(&buffer[0]);
// great, return populated std::optional
return std::make_optional<std::wstring>(&buffer[0]);
}
// not successful
@ -867,23 +867,23 @@ boost::optional<std::wstring> llstring_getoptenv(const std::string& key)
LL_WARNS() << "GetEnvironmentVariableW('" << key << "') failed: "
<< windows_message<std::string>(last_error) << LL_ENDL;
}
// return empty boost::optional
// return empty std::optional
return {};
}
#else // ! LL_WINDOWS
boost::optional<std::string> llstring_getoptenv(const std::string& key)
std::optional<std::string> llstring_getoptenv(const std::string& key)
{
auto found = getenv(key.c_str());
if (found)
{
// return populated boost::optional
return boost::optional<std::string>(found);
// return populated std::optional
return std::make_optional<std::string>(found);
}
else
{
// return empty boost::optional
// return empty std::optional
return {};
}
}

16
indra/llcommon/llstring.h
View File

@ -28,8 +28,9 @@
#define LL_LLSTRING_H
#include <boost/call_traits.hpp>
#include <boost/optional/optional.hpp>
#include <optional>
#include <string>
#include <string_view>
#include <cstdio>
#include <cwchar> // std::wcslen()
//#include <locale>
@ -42,7 +43,6 @@
// [RLVa:KB] - Checked: RLVa-2.1.0
#include <list>
// [/RLVa:KB]
#include <string_view>
#if LL_LINUX
#include <wctype.h>
@ -354,7 +354,7 @@ public:
* (key is always UTF-8)
* detect absence by (! return value)
*/
static boost::optional<string_type> getoptenv(const std::string& key);
static std::optional<string_type> getoptenv(const std::string& key);
static void addCRLF(string_type& string);
static void removeCRLF(string_type& string);
@ -833,11 +833,11 @@ STRING windows_message() { return windows_message<STRING>(GetLastError()); }
//@}
LL_COMMON_API boost::optional<std::wstring> llstring_getoptenv(const std::string& key);
LL_COMMON_API std::optional<std::wstring> llstring_getoptenv(const std::string& key);
#else // ! LL_WINDOWS
LL_COMMON_API boost::optional<std::string> llstring_getoptenv(const std::string& key);
LL_COMMON_API std::optional<std::string> llstring_getoptenv(const std::string& key);
#endif // ! LL_WINDOWS
@ -1787,17 +1787,17 @@ bool LLStringUtilBase<T>::endsWith(
// static
template<class T>
auto LLStringUtilBase<T>::getoptenv(const std::string& key) -> boost::optional<string_type>
auto LLStringUtilBase<T>::getoptenv(const std::string& key) -> std::optional<string_type>
{
auto found(llstring_getoptenv(key));
if (found)
{
// return populated boost::optional
// return populated std::optional
return { ll_convert<string_type>(*found) };
}
else
{
// empty boost::optional
// empty std::optional
return {};
}
}

24
indra/llcommon/tests/llstring_test.cpp
View File

@ -80,12 +80,12 @@ namespace tut
void string_index_object_t::test<3>()
{
std::string str("Len=5");
ensure("isValidIndex failed", LLStringUtil::isValidIndex(str, 0) == TRUE &&
LLStringUtil::isValidIndex(str, 5) == TRUE &&
LLStringUtil::isValidIndex(str, 6) == FALSE);
ensure("isValidIndex failed", LLStringUtil::isValidIndex(str, 0) == true &&
LLStringUtil::isValidIndex(str, 5) == true &&
LLStringUtil::isValidIndex(str, 6) == false);
std::string str1;
ensure("isValidIndex failed fo rempty string", LLStringUtil::isValidIndex(str1, 0) == FALSE);
ensure("isValidIndex failed fo rempty string", LLStringUtil::isValidIndex(str1, 0) == false);
}
template<> template<>
@ -153,10 +153,10 @@ namespace tut
void string_index_object_t::test<10>()
{
std::string str_val("Second");
ensure("1. isHead failed", LLStringUtil::isHead(str_val, "SecondLife Source") == TRUE);
ensure("2. isHead failed", LLStringUtil::isHead(str_val, " SecondLife Source") == FALSE);
ensure("1. isHead failed", LLStringUtil::isHead(str_val, "SecondLife Source") == true);
ensure("2. isHead failed", LLStringUtil::isHead(str_val, " SecondLife Source") == false);
std::string str_val2("");
ensure("3. isHead failed", LLStringUtil::isHead(str_val2, "") == FALSE);
ensure("3. isHead failed", LLStringUtil::isHead(str_val2, "") == false);
}
template<> template<>
@ -206,10 +206,10 @@ namespace tut
void string_index_object_t::test<15>()
{
std::string str_val("Hello.\n\r\t");
ensure("containsNonprintable failed", LLStringUtil::containsNonprintable(str_val) == TRUE);
ensure("containsNonprintable failed", LLStringUtil::containsNonprintable(str_val) == true);
str_val = "ABC ";
ensure("containsNonprintable failed", LLStringUtil::containsNonprintable(str_val) == FALSE);
ensure("containsNonprintable failed", LLStringUtil::containsNonprintable(str_val) == false);
}
template<> template<>
@ -457,17 +457,17 @@ namespace tut
std::string lhs_str("PROgraM12files");
std::string rhs_str("PROgram12Files");
ensure("compareDict 1 failed", LLStringUtil::compareDict(lhs_str, rhs_str) < 0);
ensure("precedesDict 1 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == TRUE);
ensure("precedesDict 1 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == true);
lhs_str = "PROgram12Files";
rhs_str = "PROgram12Files";
ensure("compareDict 2 failed", LLStringUtil::compareDict(lhs_str, rhs_str) == 0);
ensure("precedesDict 2 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == FALSE);
ensure("precedesDict 2 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == false);
lhs_str = "PROgram12Files";
rhs_str = "PROgRAM12FILES";
ensure("compareDict 3 failed", LLStringUtil::compareDict(lhs_str, rhs_str) > 0);
ensure("precedesDict 3 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == FALSE);
ensure("precedesDict 3 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == false);
}
template<> template<>

2
indra/llcorehttp/bufferarray.cpp
View File

@ -149,7 +149,7 @@ size_t BufferArray::append(const void * src, size_t len)
}
catch (std::bad_alloc&)
{
LLMemory::logMemoryInfo(TRUE);
LLMemory::logMemoryInfo(true);
//output possible call stacks to log file.
LLError::LLCallStacks::print();

2
indra/llfilesystem/lldir_win32.cpp
View File

@ -56,7 +56,7 @@ namespace
void prelog(const std::string& message)
{
boost::optional<std::string> prelog_name;
std::optional<std::string> prelog_name;
switch (state)
{

20
indra/llmath/tests/llbbox_test.cpp
View File

@ -340,11 +340,11 @@ namespace tut
LLBBox bbox1(LLVector3(1.0f, 1.0f, 1.0f), LLQuaternion(),
LLVector3(1.0f, 2.0f, 3.0f), LLVector3(3.0f, 4.0f, 5.0f));
ensure("containsPointLocal(0,0,0)", bbox1.containsPointLocal(LLVector3(0.0f, 0.0f, 0.0f)) == FALSE);
ensure("containsPointLocal(1,2,3)", bbox1.containsPointLocal(LLVector3(1.0f, 2.0f, 3.0f)) == TRUE);
ensure("containsPointLocal(0.999,2,3)", bbox1.containsPointLocal(LLVector3(0.999f, 2.0f, 3.0f)) == FALSE);
ensure("containsPointLocal(3,4,5)", bbox1.containsPointLocal(LLVector3(3.0f, 4.0f, 5.0f)) == TRUE);
ensure("containsPointLocal(3,4,5.001)", bbox1.containsPointLocal(LLVector3(3.0f, 4.0f, 5.001f)) == FALSE);
ensure("containsPointLocal(0,0,0)", bbox1.containsPointLocal(LLVector3(0.0f, 0.0f, 0.0f)) == false);
ensure("containsPointLocal(1,2,3)", bbox1.containsPointLocal(LLVector3(1.0f, 2.0f, 3.0f)) == true);
ensure("containsPointLocal(0.999,2,3)", bbox1.containsPointLocal(LLVector3(0.999f, 2.0f, 3.0f)) == false);
ensure("containsPointLocal(3,4,5)", bbox1.containsPointLocal(LLVector3(3.0f, 4.0f, 5.0f)) == true);
ensure("containsPointLocal(3,4,5.001)", bbox1.containsPointLocal(LLVector3(3.0f, 4.0f, 5.001f)) == false);
}
template<> template<>
@ -357,11 +357,11 @@ namespace tut
LLBBox bbox1(LLVector3(1.0f, 1.0f, 1.0f), LLQuaternion(),
LLVector3(1.0f, 2.0f, 3.0f), LLVector3(3.0f, 4.0f, 5.0f));
ensure("containsPointAgent(0,0,0)", bbox1.containsPointAgent(LLVector3(0.0f, 0.0f, 0.0f)) == FALSE);
ensure("containsPointAgent(2,3,4)", bbox1.containsPointAgent(LLVector3(2.0f, 3.0f, 4.0f)) == TRUE);
ensure("containsPointAgent(2,2.999,4)", bbox1.containsPointAgent(LLVector3(2.0f, 2.999f, 4.0f)) == FALSE);
ensure("containsPointAgent(4,5,6)", bbox1.containsPointAgent(LLVector3(4.0f, 5.0f, 6.0f)) == TRUE);
ensure("containsPointAgent(4,5.001,6)", bbox1.containsPointAgent(LLVector3(4.0f, 5.001f, 6.0f)) == FALSE);
ensure("containsPointAgent(0,0,0)", bbox1.containsPointAgent(LLVector3(0.0f, 0.0f, 0.0f)) == false);
ensure("containsPointAgent(2,3,4)", bbox1.containsPointAgent(LLVector3(2.0f, 3.0f, 4.0f)) == true);
ensure("containsPointAgent(2,2.999,4)", bbox1.containsPointAgent(LLVector3(2.0f, 2.999f, 4.0f)) == false);
ensure("containsPointAgent(4,5,6)", bbox1.containsPointAgent(LLVector3(4.0f, 5.0f, 6.0f)) == true);
ensure("containsPointAgent(4,5.001,6)", bbox1.containsPointAgent(LLVector3(4.0f, 5.001f, 6.0f)) == false);
}
}

28
indra/llmath/tests/llrect_test.cpp
View File

@ -471,13 +471,13 @@ namespace tut
LLRectf rect(1.0f, 3.0f, 3.0f, 1.0f);
ensure("(0,0) not in rect", rect.pointInRect(0.0f, 0.0f) == FALSE);
ensure("(2,2) in rect", rect.pointInRect(2.0f, 2.0f) == TRUE);
ensure("(1,1) in rect", rect.pointInRect(1.0f, 1.0f) == TRUE);
ensure("(3,3) not in rect", rect.pointInRect(3.0f, 3.0f) == FALSE);
ensure("(2.999,2.999) in rect", rect.pointInRect(2.999f, 2.999f) == TRUE);
ensure("(2.999,3.0) not in rect", rect.pointInRect(2.999f, 3.0f) == FALSE);
ensure("(3.0,2.999) not in rect", rect.pointInRect(3.0f, 2.999f) == FALSE);
ensure("(0,0) not in rect", rect.pointInRect(0.0f, 0.0f) == false);
ensure("(2,2) in rect", rect.pointInRect(2.0f, 2.0f) == true);
ensure("(1,1) in rect", rect.pointInRect(1.0f, 1.0f) == true);
ensure("(3,3) not in rect", rect.pointInRect(3.0f, 3.0f) == false);
ensure("(2.999,2.999) in rect", rect.pointInRect(2.999f, 2.999f) == true);
ensure("(2.999,3.0) not in rect", rect.pointInRect(2.999f, 3.0f) == false);
ensure("(3.0,2.999) not in rect", rect.pointInRect(3.0f, 2.999f) == false);
}
template<> template<>
@ -489,13 +489,13 @@ namespace tut
LLRectf rect(1.0f, 3.0f, 3.0f, 1.0f);
ensure("(0,0) in local rect", rect.localPointInRect(0.0f, 0.0f) == TRUE);
ensure("(-0.0001,-0.0001) not in local rect", rect.localPointInRect(-0.0001f, -0.001f) == FALSE);
ensure("(1,1) in local rect", rect.localPointInRect(1.0f, 1.0f) == TRUE);
ensure("(2,2) not in local rect", rect.localPointInRect(2.0f, 2.0f) == FALSE);
ensure("(1.999,1.999) in local rect", rect.localPointInRect(1.999f, 1.999f) == TRUE);
ensure("(1.999,2.0) not in local rect", rect.localPointInRect(1.999f, 2.0f) == FALSE);
ensure("(2.0,1.999) not in local rect", rect.localPointInRect(2.0f, 1.999f) == FALSE);
ensure("(0,0) in local rect", rect.localPointInRect(0.0f, 0.0f) == true);
ensure("(-0.0001,-0.0001) not in local rect", rect.localPointInRect(-0.0001f, -0.001f) == false);
ensure("(1,1) in local rect", rect.localPointInRect(1.0f, 1.0f) == true);
ensure("(2,2) not in local rect", rect.localPointInRect(2.0f, 2.0f) == false);
ensure("(1.999,1.999) in local rect", rect.localPointInRect(1.999f, 1.999f) == true);
ensure("(1.999,2.0) not in local rect", rect.localPointInRect(1.999f, 2.0f) == false);
ensure("(2.0,1.999) not in local rect", rect.localPointInRect(2.0f, 1.999f) == false);
}
template<> template<>

14
indra/llmath/tests/v2math_test.cpp
View File

@ -93,15 +93,15 @@ namespace tut
{
F32 x =-2.0f, y = -3.0f ;
LLVector2 vec2(x,y);
ensure_equals("abs():Fail", vec2.abs(), TRUE);
ensure_equals("abs():Fail", vec2.abs(), true);
ensure("abs() x", is_approx_equal(vec2.mV[VX], 2.f));
ensure("abs() y", is_approx_equal(vec2.mV[VY], 3.f));
ensure("isNull():Fail ", FALSE == vec2.isNull()); //Returns TRUE if vector has a _very_small_ length
ensure("isNull():Fail ", false == vec2.isNull()); //Returns true if vector has a _very_small_ length
x =.00000001f, y = .000001001f;
vec2.setVec(x, y);
ensure("isNull(): Fail ", TRUE == vec2.isNull());
ensure("isNull(): Fail ", true == vec2.isNull());
}
template<> template<>
@ -111,12 +111,12 @@ namespace tut
LLVector2 vec2(x, y), vec3;
vec3 = vec3.scaleVec(vec2);
ensure("scaleVec: Fail ", vec3.mV[VX] == 0. && vec3.mV[VY] == 0.);
ensure("isExactlyZero(): Fail", TRUE == vec3.isExactlyZero());
ensure("isExactlyZero(): Fail", true == vec3.isExactlyZero());
vec3.setVec(2.f, 1.f);
vec3 = vec3.scaleVec(vec2);
ensure("scaleVec: Fail ", (2.f == vec3.mV[VX]) && (2.f == vec3.mV[VY]));
ensure("isExactlyZero():Fail", FALSE == vec3.isExactlyZero());
ensure("isExactlyZero():Fail", false == vec3.isExactlyZero());
}
template<> template<>
@ -254,7 +254,7 @@ namespace tut
vec3.clearVec();
vec2.setVec(x1, y1);
vec3.setVec(vec2);
ensure("2:operator!= failed", (FALSE == (vec2 != vec3)));
ensure("2:operator!= failed", (false == (vec2 != vec3)));
}
template<> template<>
void v2math_object::test<13>()
@ -373,7 +373,7 @@ namespace tut
x1 = 1.0f, y1 = 2.0f, x2 = 1.0f, y2 = 3.2234f;
vec2.setVec(x1, y1);
vec3.setVec(x2, y2);
ensure("2:operator < failed", (FALSE == (vec3 < vec2)));
ensure("2:operator < failed", (false == (vec3 < vec2)));
}
template<> template<>

2
indra/llmath/tests/v3color_test.cpp
View File

@ -209,7 +209,7 @@ namespace tut
ensure("1:operator!= failed",(llcolor3 != llcolor3a));
llcolor3.setToBlack();
llcolor3a.setVec(llcolor3);
ensure("2:operator!= failed", ( FALSE == (llcolor3a != llcolor3)));
ensure("2:operator!= failed", ( false == (llcolor3a != llcolor3)));
}
template<> template<>

20
indra/llmath/tests/v3dmath_test.cpp
View File

@ -128,15 +128,15 @@ namespace tut
LLVector3d vec3D(x,y,z);
vec3D.abs();
ensure("1:abs:Fail ", ((-x == vec3D.mdV[VX]) && (y == vec3D.mdV[VY]) && (-z == vec3D.mdV[VZ])));
ensure("2:isNull():Fail ", (FALSE == vec3D.isNull()));
ensure("2:isNull():Fail ", (false == vec3D.isNull()));
vec3D.clearVec();
x =.00000001, y = .000001001, z = .000001001;
vec3D.setVec(x,y,z);
ensure("3:isNull():Fail ", (TRUE == vec3D.isNull()));
ensure("4:isExactlyZero():Fail ", (FALSE == vec3D.isExactlyZero()));
ensure("3:isNull():Fail ", (true == vec3D.isNull()));
ensure("4:isExactlyZero():Fail ", (false == vec3D.isExactlyZero()));
x =.0000000, y = .00000000, z = .00000000;
vec3D.setVec(x,y,z);
ensure("5:isExactlyZero():Fail ", (TRUE == vec3D.isExactlyZero()));
ensure("5:isExactlyZero():Fail ", (true == vec3D.isExactlyZero()));
}
template<> template<>
@ -353,7 +353,7 @@ namespace tut
{
F64 x1 = 1., y1 = 2., z1 = -1.1;
LLVector3d vec3D(x1,y1,z1), vec3Da;
ensure("1:operator!= failed",(TRUE == (vec3D !=vec3Da)));
ensure("1:operator!= failed",(true == (vec3D !=vec3Da)));
vec3Da = vec3D;
ensure("2:operator== failed",(vec3D ==vec3Da));
vec3D.clearVec();
@ -362,7 +362,7 @@ namespace tut
vec3D.setVec(x1,y1,z1);
vec3Da.setVec(x1,y1,z1);
ensure("3:operator== failed",(vec3D ==vec3Da));
ensure("4:operator!= failed",(FALSE == (vec3D !=vec3Da)));
ensure("4:operator!= failed",(false == (vec3D !=vec3Da)));
}
template<> template<>
@ -482,10 +482,10 @@ namespace tut
F64 x = 2.32, y = 1.212, z = -.12;
F64 min = 0.0001, max = 3.0;
LLVector3d vec3d(x,y,z);
ensure("1:clamp:Fail ", (TRUE == (vec3d.clamp(min, max))));
ensure("1:clamp:Fail ", (true == (vec3d.clamp(min, max))));
x = 0.000001f, z = 5.3f;
vec3d.setVec(x,y,z);
ensure("2:clamp:Fail ", (TRUE == (vec3d.clamp(min, max))));
ensure("2:clamp:Fail ", (true == (vec3d.clamp(min, max))));
}
template<> template<>
@ -494,11 +494,11 @@ namespace tut
F64 x = 10., y = 20., z = -15.;
F64 epsilon = .23425;
LLVector3d vec3Da(x,y,z), vec3Db(x,y,z);
ensure("1:are_parallel: Fail ", (TRUE == are_parallel(vec3Da,vec3Db,epsilon)));
ensure("1:are_parallel: Fail ", (true == are_parallel(vec3Da,vec3Db,epsilon)));
F64 x1 = -12., y1 = -20., z1 = -100.;
vec3Db.clearVec();
vec3Db.setVec(x1,y1,z1);
ensure("2:are_parallel: Fail ", (FALSE == are_parallel(vec3Da,vec3Db,epsilon)));
ensure("2:are_parallel: Fail ", (false == are_parallel(vec3Da,vec3Db,epsilon)));
}
template<> template<>

24
indra/llmath/tests/v3math_test.cpp
View File

@ -99,7 +99,7 @@ namespace tut
{
F32 x = 2.32f, y = 1.212f, z = -.12f;
LLVector3 vec3(x,y,z);
ensure("1:isFinite= Fail to initialize ", (TRUE == vec3.isFinite()));//need more test cases:
ensure("1:isFinite= Fail to initialize ", (true == vec3.isFinite()));//need more test cases:
vec3.clearVec();
ensure("2:clearVec:Fail to set values ", ((0.f == vec3.mV[VX]) && (0.f == vec3.mV[VY]) && (0.f == vec3.mV[VZ])));
vec3.setVec(x,y,z);
@ -137,10 +137,10 @@ namespace tut
F32 x = 2.32f, y = 3.212f, z = -.12f;
F32 min = 0.0001f, max = 3.0f;
LLVector3 vec3(x,y,z);
ensure("1:clamp:Fail ", TRUE == vec3.clamp(min, max) && x == vec3.mV[VX] && max == vec3.mV[VY] && min == vec3.mV[VZ]);
ensure("1:clamp:Fail ", true == vec3.clamp(min, max) && x == vec3.mV[VX] && max == vec3.mV[VY] && min == vec3.mV[VZ]);
x = 1.f, y = 2.2f, z = 2.8f;
vec3.setVec(x,y,z);
ensure("2:clamp:Fail ", FALSE == vec3.clamp(min, max));
ensure("2:clamp:Fail ", false == vec3.clamp(min, max));
}
template<> template<>
@ -157,11 +157,11 @@ namespace tut
{
F32 x =-2.0f, y = -3.0f, z = 1.23f ;
LLVector3 vec3(x,y,z);
ensure("1:abs():Fail ", (TRUE == vec3.abs()));
ensure("2:isNull():Fail", (FALSE == vec3.isNull())); //Returns TRUE if vector has a _very_small_ length
ensure("1:abs():Fail ", (true == vec3.abs()));
ensure("2:isNull():Fail", (false == vec3.isNull())); //Returns TRUE if vector has a _very_small_ length
x =.00000001f, y = .000001001f, z = .000001001f;
vec3.setVec(x,y,z);
ensure("3:isNull(): Fail ", (TRUE == vec3.isNull()));
ensure("3:isNull(): Fail ", (true == vec3.isNull()));
}
template<> template<>
@ -169,13 +169,13 @@ namespace tut
{
F32 x =-2.0f, y = -3.0f, z = 1.f ;
LLVector3 vec3(x,y,z),vec3a;
ensure("1:isExactlyZero():Fail ", (TRUE == vec3a.isExactlyZero()));
ensure("1:isExactlyZero():Fail ", (true == vec3a.isExactlyZero()));
vec3a = vec3a.scaleVec(vec3);
ensure("2:scaleVec: Fail ", vec3a.mV[VX] == 0.f && vec3a.mV[VY] == 0.f && vec3a.mV[VZ] == 0.f);
vec3a.setVec(x,y,z);
vec3a = vec3a.scaleVec(vec3);
ensure("3:scaleVec: Fail ", ((4 == vec3a.mV[VX]) && (9 == vec3a.mV[VY]) &&(1 == vec3a.mV[VZ])));
ensure("4:isExactlyZero():Fail ", (FALSE == vec3.isExactlyZero()));
ensure("4:isExactlyZero():Fail ", (false == vec3.isExactlyZero()));
}
template<> template<>
@ -356,7 +356,7 @@ namespace tut
vec3.clearVec();
vec3.clearVec();
vec3a.setVec(vec3);
ensure("2:operator!= failed", ( FALSE == (vec3a != vec3)));
ensure("2:operator!= failed", ( false == (vec3a != vec3)));
}
template<> template<>
@ -454,15 +454,15 @@ namespace tut
{
F32 x1 =-2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, y2 = 1.11f, z2 = 1234.234f;
LLVector3 vec3(x1,y1,z1), vec3a(x2,y2,z2);
ensure("1:operator< failed", (TRUE == (vec3 < vec3a)));
ensure("1:operator< failed", (true == (vec3 < vec3a)));
x1 =-2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, y2 = 2.f, z2 = 1234.234f;
vec3.setVec(x1,y1,z1);
vec3a.setVec(x2,y2,z2);
ensure("2:operator< failed ", (TRUE == (vec3 < vec3a)));
ensure("2:operator< failed ", (true == (vec3 < vec3a)));
x1 =2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f,
vec3.setVec(x1,y1,z1);
vec3a.setVec(x2,y2,z2);
ensure("3:operator< failed ", (FALSE == (vec3 < vec3a)));
ensure("3:operator< failed ", (false == (vec3 < vec3a)));
}
template<> template<>

4
indra/llmath/tests/v4coloru_test.cpp
View File

@ -287,10 +287,10 @@ namespace tut
ensure("parseColor4U() failed to parse the color value ", ((12 == llcolor4u1.mV[VX]) && (23 == llcolor4u1.mV[VY]) && (132 == llcolor4u1.mV[VZ])&& (50 == llcolor4u1.mV[VW])));
color = "12, 23, 132";
ensure("2:parseColor4U() failed to parse the color value ", (FALSE == LLColor4U::parseColor4U(color, &llcolor4u1)));
ensure("2:parseColor4U() failed to parse the color value ", (false == LLColor4U::parseColor4U(color, &llcolor4u1)));
color = "12";
ensure("2:parseColor4U() failed to parse the color value ", (FALSE == LLColor4U::parseColor4U(color, &llcolor4u1)));
ensure("2:parseColor4U() failed to parse the color value ", (false == LLColor4U::parseColor4U(color, &llcolor4u1)));
}
template<> template<>

8
indra/llmath/tests/v4math_test.cpp
View File

@ -123,9 +123,9 @@ namespace tut
vec4.abs();
ensure("abs:Fail " ,((x == vec4.mV[VX]) && (-y == vec4.mV[VY]) && (-z == vec4.mV[VZ])&& (-w == vec4.mV[VW])));
vec4.clearVec();
ensure("isExactlyClear:Fail " ,(TRUE == vec4.isExactlyClear()));
ensure("isExactlyClear:Fail " ,(true == vec4.isExactlyClear()));
vec4.zeroVec();
ensure("isExactlyZero:Fail " ,(TRUE == vec4.isExactlyZero()));
ensure("isExactlyZero:Fail " ,(true == vec4.isExactlyZero()));
}
template<> template<>
@ -303,11 +303,11 @@ namespace tut
{
F32 x = 1.f, y = 2.f, z = -1.1f,epsilon = .23425f;
LLVector4 vec4(x,y,z), vec4a(x,y,z);
ensure("1:are_parallel: Fail " ,(TRUE == are_parallel(vec4a,vec4,epsilon)));
ensure("1:are_parallel: Fail " ,(true == are_parallel(vec4a,vec4,epsilon)));
x = 21.f, y = 12.f, z = -123.1f;
vec4a.clearVec();
vec4a.setVec(x,y,z);
ensure("2:are_parallel: Fail " ,(FALSE == are_parallel(vec4a,vec4,epsilon)));
ensure("2:are_parallel: Fail " ,(false == are_parallel(vec4a,vec4,epsilon)));
}
template<> template<>

4
indra/llmath/tests/xform_test.cpp
View File

@ -91,7 +91,7 @@ namespace tut
xform_obj.setPositionZ(z);
ensure("setPositionX/Y/Z failed: ", xform_obj.getPosition() == vec);
xform_obj.setScaleChildOffset(TRUE);
xform_obj.setScaleChildOffset(true);
ensure("setScaleChildOffset failed: ", xform_obj.getScaleChildOffset());
vec.setVec(x, y, z);
@ -216,7 +216,7 @@ namespace tut
parent.setPosition(llvecpospar);
LLVector3 llvecparentscale(1.0, 2.0, 0);
parent.setScaleChildOffset(TRUE);
parent.setScaleChildOffset(true);
parent.setScale(llvecparentscale);
LLQuaternion quat(1, 2, 3, 4);

2
indra/llui/fsregistrarutils.h
View File

@ -28,6 +28,8 @@
#ifndef FS_REGISTRARUTILS_H
#define FS_REGISTRARUTILS_H
#include <functional>
enum class EFSRegistrarFunctionActionType
{
FS_RGSTR_ACT_ADD_FRIEND,

2
indra/llui/llnotifications.cpp
View File

@ -220,7 +220,7 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica
bool show_notification = true;
if (p.ignore.control.isProvided())
{
mIgnoreSetting = ui_inst->mSettingGroups["config"]->getControl(p.ignore.control);
mIgnoreSetting = ui_inst->mSettingGroups["config"]->getControl(p.ignore.control());
mInvertSetting = p.ignore.invert_control;
}
else if (mIgnore > IGNORE_NO)

2
indra/llwindow/llwindowwin32.cpp
View File

@ -94,7 +94,7 @@ const UINT WM_DUMMY_(WM_USER + 0x0017);
const UINT WM_POST_FUNCTION_(WM_USER + 0x0018);
extern bool gDebugWindowProc;
extern BOOL gDisconnected; // <FS:Beq/> [FIRE-32453][BUG-232971] Improve shutdown behaviour.
extern bool gDisconnected; // <FS:Beq/> [FIRE-32453][BUG-232971] Improve shutdown behaviour.
static std::thread::id sWindowThreadId;
static std::thread::id sMainThreadId;

124
indra/llxml/llcontrol.cpp
View File

@ -77,19 +77,19 @@ template <> LLSD convert_to_llsd<LLColor4>(const LLColor4& in);
template <> LLSD convert_to_llsd<LLColor3>(const LLColor3& in);
template <> LLSD convert_to_llsd<LLColor4U>(const LLColor4U& in);
template <> bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLColor4U convert_from_llsd<LLColor4U>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, const std::string& control_name);
template <> bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLColor4U convert_from_llsd<LLColor4U>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, std::string_view control_name);
template <> LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, std::string_view control_name);
//this defines the current version of the settings file
const S32 CURRENT_VERSION = 101;
@ -229,12 +229,12 @@ void LLControlVariable::setValue(const LLSD& new_value, bool saved_value)
LLSD storable_value = getComparableValue(new_value);
LLSD original_value = getValue();
bool value_changed = llsd_compare(original_value, storable_value) == FALSE;
bool value_changed = llsd_compare(original_value, storable_value) == false;
if(saved_value)
{
// If we're going to save this value, return to default but don't fire
resetToDefault(false);
if (llsd_compare(mValues.back(), storable_value) == FALSE)
if (llsd_compare(mValues.back(), storable_value) == false)
{
mValues.push_back(storable_value);
}
@ -244,7 +244,7 @@ void LLControlVariable::setValue(const LLSD& new_value, bool saved_value)
// This is an unsaved value. Its needs to reside at
// mValues[2] (or greater). It must not affect
// the result of getSaveValue()
if (llsd_compare(mValues.back(), storable_value) == FALSE)
if (llsd_compare(mValues.back(), storable_value) == false)
{
while(mValues.size() > 2)
{
@ -279,7 +279,7 @@ void LLControlVariable::setDefaultValue(const LLSD& value)
LLSD comparable_value = getComparableValue(value);
LLSD original_value = getValue();
bool value_changed = (llsd_compare(original_value, comparable_value) == FALSE);
bool value_changed = (llsd_compare(original_value, comparable_value) == false);
resetToDefault(false);
mValues[0] = comparable_value;
if(value_changed)
@ -412,14 +412,14 @@ LLSD LLControlVariable::getSaveValue() const
return mValues[0];
}
LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
LLPointer<LLControlVariable> LLControlGroup::getControl(std::string_view name)
{
if (mSettingsProfile)
{
incrCount(name);
}
ctrl_name_table_t::iterator iter = mNameTable.find(name);
ctrl_name_table_t::iterator iter = mNameTable.find(name.data());
return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second;
}
@ -653,46 +653,46 @@ LLControlVariable* LLControlGroup::declareLLSD(const std::string& name, const LL
return declareControl(name, TYPE_LLSD, initial_val, comment, SANITY_TYPE_NONE, LLSD(), std::string(""), persist);
}
void LLControlGroup::incrCount(const std::string& name)
void LLControlGroup::incrCount(std::string_view name)
{
if (0.0 == start_time)
{
start_time = LLTimer::getTotalSeconds();
}
getCount[name] = getCount[name].asInteger() + 1;
getCount[name.data()] = getCount[name.data()].asInteger() + 1;
}
bool LLControlGroup::getBOOL(const std::string& name)
bool LLControlGroup::getBOOL(std::string_view name)
{
return get<bool>(name);
}
S32 LLControlGroup::getS32(const std::string& name)
S32 LLControlGroup::getS32(std::string_view name)
{
return get<S32>(name);
}
U32 LLControlGroup::getU32(const std::string& name)
U32 LLControlGroup::getU32(std::string_view name)
{
return get<U32>(name);
}
F32 LLControlGroup::getF32(const std::string& name)
F32 LLControlGroup::getF32(std::string_view name)
{
return get<F32>(name);
}
std::string LLControlGroup::getString(const std::string& name)
std::string LLControlGroup::getString(std::string_view name)
{
return get<std::string>(name);
}
LLWString LLControlGroup::getWString(const std::string& name)
LLWString LLControlGroup::getWString(std::string_view name)
{
return get<LLWString>(name);
}
std::string LLControlGroup::getText(const std::string& name)
std::string LLControlGroup::getText(std::string_view name)
{
std::string utf8_string = getString(name);
LLStringUtil::replaceChar(utf8_string, '^', '\n');
@ -700,43 +700,43 @@ std::string LLControlGroup::getText(const std::string& name)
return (utf8_string);
}
LLVector3 LLControlGroup::getVector3(const std::string& name)
LLVector3 LLControlGroup::getVector3(std::string_view name)
{
return get<LLVector3>(name);
}
LLVector3d LLControlGroup::getVector3d(const std::string& name)
LLVector3d LLControlGroup::getVector3d(std::string_view name)
{
return get<LLVector3d>(name);
}
LLQuaternion LLControlGroup::getQuaternion(const std::string& name)
LLQuaternion LLControlGroup::getQuaternion(std::string_view name)
{
return get<LLQuaternion>(name);
}
LLRect LLControlGroup::getRect(const std::string& name)
LLRect LLControlGroup::getRect(std::string_view name)
{
return get<LLRect>(name);
}
LLColor4 LLControlGroup::getColor(const std::string& name)
LLColor4 LLControlGroup::getColor(std::string_view name)
{
return get<LLColor4>(name);
}
LLColor4 LLControlGroup::getColor4(const std::string& name)
LLColor4 LLControlGroup::getColor4(std::string_view name)
{
return get<LLColor4>(name);
}
LLColor3 LLControlGroup::getColor3(const std::string& name)
LLColor3 LLControlGroup::getColor3(std::string_view name)
{
return get<LLColor3>(name);
}
LLSD LLControlGroup::getLLSD(const std::string& name)
LLSD LLControlGroup::getLLSD(std::string_view name)
{
return get<LLSD>(name);
}
@ -770,67 +770,67 @@ bool LLControlGroup::controlExists(const std::string& name)
// Set functions
//-------------------------------------------------------------------
void LLControlGroup::setBOOL(const std::string& name, bool val)
void LLControlGroup::setBOOL(std::string_view name, bool val)
{
set<bool>(name, val);
}
void LLControlGroup::setS32(const std::string& name, S32 val)
void LLControlGroup::setS32(std::string_view name, S32 val)
{
set(name, val);
}
void LLControlGroup::setF32(const std::string& name, F32 val)
void LLControlGroup::setF32(std::string_view name, F32 val)
{
set(name, val);
}
void LLControlGroup::setU32(const std::string& name, U32 val)
void LLControlGroup::setU32(std::string_view name, U32 val)
{
set(name, val);
}
void LLControlGroup::setString(const std::string& name, const std::string &val)
void LLControlGroup::setString(std::string_view name, const std::string &val)
{
set(name, val);
}
void LLControlGroup::setVector3(const std::string& name, const LLVector3 &val)
void LLControlGroup::setVector3(std::string_view name, const LLVector3 &val)
{
set(name, val);
}
void LLControlGroup::setVector3d(const std::string& name, const LLVector3d &val)
void LLControlGroup::setVector3d(std::string_view name, const LLVector3d &val)
{
set(name, val);
}
void LLControlGroup::setQuaternion(const std::string& name, const LLQuaternion &val)
void LLControlGroup::setQuaternion(std::string_view name, const LLQuaternion &val)
{
set(name, val);
}
void LLControlGroup::setRect(const std::string& name, const LLRect &val)
void LLControlGroup::setRect(std::string_view name, const LLRect &val)
{
set(name, val);
}
void LLControlGroup::setColor4(const std::string& name, const LLColor4 &val)
void LLControlGroup::setColor4(std::string_view name, const LLColor4 &val)
{
set(name, val);
}
void LLControlGroup::setLLSD(const std::string& name, const LLSD& val)
void LLControlGroup::setLLSD(std::string_view name, const LLSD& val)
{
set(name, val);
}
void LLControlGroup::setUntypedValue(const std::string& name, const LLSD& val)
void LLControlGroup::setUntypedValue(std::string_view name, const LLSD& val)
{
if (name.empty())
{
@ -1421,19 +1421,19 @@ template <> LLSD convert_to_llsd<LLColor4U>(const LLColor4U& in)
template<>
bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::string& control_name)
bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_BOOLEAN)
return sd.asBoolean();
else
{
CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return FALSE;
return false;
}
}
template<>
S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string& control_name)
S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_S32)
return sd.asInteger();
@ -1445,7 +1445,7 @@ S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string&
}
template<>
U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string& control_name)
U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_U32)
return sd.asInteger();
@ -1457,7 +1457,7 @@ U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string&
}
template<>
F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string& control_name)
F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_F32)
return (F32) sd.asReal();
@ -1469,7 +1469,7 @@ F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string&
}
template<>
std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, const std::string& control_name)
std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_STRING)
return sd.asString();
@ -1481,13 +1481,13 @@ std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, co
}
template<>
LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, const std::string& control_name)
LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, std::string_view control_name)
{
return utf8str_to_wstring(convert_from_llsd<std::string>(sd, type, control_name));
}
template<>
LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name)
LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_VEC3)
return (LLVector3)sd;
@ -1499,7 +1499,7 @@ LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const
}
template<>
LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name)
LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_VEC3D)
return (LLVector3d)sd;
@ -1511,7 +1511,7 @@ LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, cons
}
template<>
LLQuaternion convert_from_llsd<LLQuaternion>(const LLSD& sd, eControlType type, const std::string& control_name)
LLQuaternion convert_from_llsd<LLQuaternion>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_QUAT)
return (LLQuaternion)sd;
@ -1523,7 +1523,7 @@ LLQuaternion convert_from_llsd<LLQuaternion>(const LLSD& sd, eControlType type,
}
template<>
LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name)
LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_RECT)
return LLRect(sd);
@ -1536,7 +1536,7 @@ LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::s
template<>
LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const std::string& control_name)
LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_COL4)
{
@ -1568,7 +1568,7 @@ LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const st
}
template<>
LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const std::string& control_name)
LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, std::string_view control_name)
{
if (type == TYPE_COL3)
return sd;
@ -1580,7 +1580,7 @@ LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const st
}
template<>
LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, const std::string& control_name)
LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, std::string_view control_name)
{
return sd;
}

92
indra/llxml/llcontrol.h
View File

@ -180,7 +180,7 @@ public:
LLSD getSaveValue() const;
void set(const LLSD& val) { setValue(val); }
void setValue(const LLSD& value, bool saved_value = TRUE);
void setValue(const LLSD& value, bool saved_value = true);
void setDefaultValue(const LLSD& value);
void setPersist(ePersist);
void setBackupable(bool state); // <FS:Zi> Backup Settings
@ -214,7 +214,7 @@ LLSD convert_to_llsd(const T& in)
}
template <class T>
T convert_from_llsd(const LLSD& sd, eControlType type, const std::string& control_name)
T convert_from_llsd(const LLSD& sd, eControlType type, std::string_view control_name)
{
// needs specialization
return T(sd);
@ -241,7 +241,7 @@ public:
~LLControlGroup();
void cleanup();
LLControlVariablePtr getControl(const std::string& name);
LLControlVariablePtr getControl(std::string_view name);
struct ApplyFunctor
{
@ -268,28 +268,28 @@ public:
LLControlVariable* declareColor3(const std::string& name, const LLColor3 &initial_val, const std::string& comment, LLControlVariable::ePersist persist = LLControlVariable::PERSIST_NONDFT);
LLControlVariable* declareLLSD(const std::string& name, const LLSD &initial_val, const std::string& comment, LLControlVariable::ePersist persist = LLControlVariable::PERSIST_NONDFT);
std::string getString(const std::string& name);
std::string getText(const std::string& name);
bool getBOOL(const std::string& name);
S32 getS32(const std::string& name);
F32 getF32(const std::string& name);
U32 getU32(const std::string& name);
std::string getString(std::string_view name);
std::string getText(std::string_view name);
bool getBOOL(std::string_view name);
S32 getS32(std::string_view name);
F32 getF32(std::string_view name);
U32 getU32(std::string_view name);
LLWString getWString(const std::string& name);
LLVector3 getVector3(const std::string& name);
LLVector3d getVector3d(const std::string& name);
LLRect getRect(const std::string& name);
LLSD getLLSD(const std::string& name);
LLQuaternion getQuaternion(const std::string& name);
LLWString getWString(std::string_view name);
LLVector3 getVector3(std::string_view name);
LLVector3d getVector3d(std::string_view name);
LLRect getRect(std::string_view name);
LLSD getLLSD(std::string_view name);
LLQuaternion getQuaternion(std::string_view name);
LLColor4 getColor(const std::string& name);
LLColor4 getColor4(const std::string& name);
LLColor3 getColor3(const std::string& name);
LLColor4 getColor(std::string_view name);
LLColor4 getColor4(std::string_view name);
LLColor3 getColor3(std::string_view name);
LLSD asLLSD(bool diffs_only);
// generic getter
template<typename T> T get(const std::string& name)
template<typename T> T get(std::string_view name)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_LLSD;
LLControlVariable* control = getControl(name);
@ -309,23 +309,23 @@ public:
return convert_from_llsd<T>(value, type, name);
}
void setBOOL(const std::string& name, bool val);
void setS32(const std::string& name, S32 val);
void setF32(const std::string& name, F32 val);
void setU32(const std::string& name, U32 val);
void setString(const std::string& name, const std::string& val);
void setVector3(const std::string& name, const LLVector3 &val);
void setVector3d(const std::string& name, const LLVector3d &val);
void setQuaternion(const std::string& name, const LLQuaternion &val);
void setRect(const std::string& name, const LLRect &val);
void setColor4(const std::string& name, const LLColor4 &val);
void setLLSD(const std::string& name, const LLSD& val);
void setBOOL(std::string_view name, bool val);
void setS32(std::string_view name, S32 val);
void setF32(std::string_view name, F32 val);
void setU32(std::string_view name, U32 val);
void setString(std::string_view name, const std::string& val);
void setVector3(std::string_view name, const LLVector3 &val);
void setVector3d(std::string_view name, const LLVector3d &val);
void setQuaternion(std::string_view name, const LLQuaternion &val);
void setRect(std::string_view name, const LLRect &val);
void setColor4(std::string_view name, const LLColor4 &val);
void setLLSD(std::string_view name, const LLSD& val);
// type agnostic setter that takes LLSD
void setUntypedValue(const std::string& name, const LLSD& val);
void setUntypedValue(std::string_view name, const LLSD& val);
// generic setter
template<typename T> void set(const std::string& name, const T& val)
template<typename T> void set(std::string_view name, const T& val)
{
LLControlVariable* control = getControl(name);
@ -348,7 +348,7 @@ public:
U32 saveToFile(const std::string& filename, bool nondefault_only);
U32 loadFromFile(const std::string& filename, bool default_values = false, bool save_values = true);
void resetToDefaults();
void incrCount(const std::string& name);
void incrCount(std::string_view name);
bool mSettingsProfile;
};
@ -499,19 +499,19 @@ template <> LLSD convert_to_llsd<LLRect>(const LLRect& in);
template <> LLSD convert_to_llsd<LLColor4>(const LLColor4& in);
template <> LLSD convert_to_llsd<LLColor3>(const LLColor3& in);
template<> std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLQuaternion convert_from_llsd<LLQuaternion>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, const std::string& control_name);
template<> std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLQuaternion convert_from_llsd<LLQuaternion>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, std::string_view control_name);
template<> LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, std::string_view control_name);
//#define TEST_CACHED_CONTROL 1
#ifdef TEST_CACHED_CONTROL

4
indra/llxml/llxmltree.cpp
View File

@ -553,14 +553,14 @@ bool LLXmlTreeParser::parseFile(const std::string &path, LLXmlTreeNode** root, b
return success;
}
BOOL LLXmlTreeParser::parseString(const std::string &string, LLXmlTreeNode** root, BOOL keep_contents)
bool LLXmlTreeParser::parseString(const std::string &string, LLXmlTreeNode** root, bool keep_contents)
{
llassert( !mRoot );
llassert( !mCurrent );
mKeepContents = keep_contents;
BOOL success = LLXmlParser::parse(string.c_str(), string.length(), true);
bool success = LLXmlParser::parse(string.c_str(), string.length(), true);
*root = mRoot;
mRoot = NULL;

2
indra/llxml/llxmltree.h
View File

@ -201,7 +201,7 @@ public:
virtual ~LLXmlTreeParser();
bool parseFile(const std::string &path, LLXmlTreeNode** root, bool keep_contents );
BOOL parseString(const std::string &string, LLXmlTreeNode** root, BOOL keep_contents);
bool parseString(const std::string &string, LLXmlTreeNode** root, bool keep_contents);
protected:
const std::string& tabs();

2
indra/newview/NACLantispam.cpp
View File

@ -337,7 +337,7 @@ void NACLAntiSpamRegistry::blockGlobalEntry(const LLUUID& source)
}
bool NACLAntiSpamRegistry::checkQueue(EAntispamQueue queue, const LLUUID& source, EAntispamSource sourcetype, U32 multiplier)
// returns TRUE if blocked, FALSE otherwise
// returns true if blocked, false otherwise
{
// skip all checks if we're we've been administratively turned off
static LLCachedControl<bool> useAntiSpam(gSavedSettings, "UseAntiSpam");

4
indra/newview/NACLfloaterexploresounds.cpp
View File

@ -400,9 +400,9 @@ void NACLFloaterExploreSounds::handleLookAt()
cam += pos_global;
cam += LLVector3d(0.0, 0.0, 3.0);
gAgentCamera.setFocusOnAvatar(FALSE, FALSE);
gAgentCamera.setFocusOnAvatar(false, false);
gAgentCamera.setCameraPosAndFocusGlobal(cam, pos_global, item.mSourceID);
gAgentCamera.setCameraAnimating(FALSE);
gAgentCamera.setCameraAnimating(false);
}
void NACLFloaterExploreSounds::handleStop()

2
indra/newview/animationexplorer.cpp
View File

@ -541,7 +541,7 @@ bool AnimationExplorer::handleMouseDown(S32 x, S32 y, MASK mask)
// Copied from llfloaterbvhpreview.cpp
bool AnimationExplorer::handleMouseUp(S32 x, S32 y, MASK mask)
{
gFocusMgr.setMouseCapture(FALSE);
gFocusMgr.setMouseCapture(nullptr);
gViewerWindow->showCursor();
return LLFloater::handleMouseUp(x, y, mask);
}

48
indra/newview/ao.cpp
View File

@ -100,7 +100,7 @@ void FloaterAO::updateAnimationList()
if (!mSelectedSet)
{
mStateSelector->setEnabled(FALSE);
mStateSelector->setEnabled(false);
mStateSelector->add(getString("ao_no_animations_loaded"));
return;
}
@ -109,7 +109,7 @@ void FloaterAO::updateAnimationList()
{
const std::string& stateName = mSelectedSet->mStateNames[index];
AOSet::AOState* state = mSelectedSet->getStateByName(stateName);
mStateSelector->add(stateName, state, ADD_BOTTOM, TRUE);
mStateSelector->add(stateName, state, ADD_BOTTOM, true);
}
enableStateControls(true);
@ -128,7 +128,7 @@ void FloaterAO::updateAnimationList()
void FloaterAO::updateList()
{
mReloadButton->setEnabled(TRUE);
mReloadButton->setEnabled(true);
mImportRunning = false;
// Lambda provides simple Alpha sorting, note this is case sensitive.
@ -159,7 +159,7 @@ void FloaterAO::updateList()
mSetSelectorSmall->add(getString("ao_no_sets_loaded"));
mSetSelector->selectNthItem(0);
mSetSelectorSmall->selectNthItem(0);
enableSetControls(FALSE);
enableSetControls(false);
return;
}
@ -182,8 +182,8 @@ void FloaterAO::updateList()
for (auto index = 0; index < mSetList.size(); ++index)
{
std::string setName = mSetList[index]->getName();
mSetSelector->add(setName, &mSetList[index], ADD_BOTTOM, TRUE);
mSetSelectorSmall->add(setName, &mSetList[index], ADD_BOTTOM, TRUE);
mSetSelector->add(setName, &mSetList[index], ADD_BOTTOM, true);
mSetSelectorSmall->add(setName, &mSetList[index], ADD_BOTTOM, true);
if (setName.compare(currentSetName) == 0)
{
selected_index = index;
@ -196,7 +196,7 @@ void FloaterAO::updateList()
mSetSelector->selectNthItem(selected_index);
mSetSelectorSmall->selectNthItem(selected_index);
enableSetControls(TRUE);
enableSetControls(true);
if (mSetSelector->getSelectedItemLabel().empty())
{
onClickReload();
@ -250,7 +250,7 @@ bool FloaterAO::postBuild()
mSmartCheckBox->setCommitCallback(boost::bind(&FloaterAO::onCheckSmart, this));
mDisableMouselookCheckBox->setCommitCallback(boost::bind(&FloaterAO::onCheckDisableStands, this));
mAnimationList->setCommitOnSelectionChange(TRUE);
mAnimationList->setCommitOnSelectionChange(true);
mStateSelector->setCommitCallback(boost::bind(&FloaterAO::onSelectState, this));
mAnimationList->setCommitCallback(boost::bind(&FloaterAO::onChangeAnimationSelection, this));
@ -404,7 +404,7 @@ void FloaterAO::onRenameSet()
{
if (AOEngine::instance().renameSet(mSelectedSet, name))
{
reloading(TRUE);
reloading(true);
return;
}
}
@ -446,7 +446,7 @@ void FloaterAO::onSelectState()
mAnimationList->deleteAllItems();
mCurrentBoldItem = nullptr;
mAnimationList->setCommentText(getString("ao_no_animations_loaded"));
mAnimationList->setEnabled(FALSE);
mAnimationList->setEnabled(false);
onChangeAnimationSelection();
@ -483,7 +483,7 @@ void FloaterAO::onSelectState()
}
mAnimationList->setCommentText("");
mAnimationList->setEnabled(TRUE);
mAnimationList->setEnabled(true);
}
mCycleCheckBox->setValue(mSelectedState->mCycle);
@ -627,8 +627,8 @@ void FloaterAO::onChangeAnimationSelection()
std::vector<LLScrollListItem*> list = mAnimationList->getAllSelected();
LL_DEBUGS("AOEngine") << "Selection count: " << list.size() << LL_ENDL;
BOOL resortEnable = FALSE;
BOOL trashEnable = FALSE;
bool resortEnable = false;
bool trashEnable = false;
// Linden Lab bug: scroll lists still select the first item when you click on them, even when they are disabled.
// The control does not memorize it's enabled/disabled state, so mAnimationList->mEnabled() doesn't seem to work.
@ -642,9 +642,9 @@ void FloaterAO::onChangeAnimationSelection()
{
if (list.size() == 1)
{
resortEnable = TRUE;
resortEnable = true;
}
trashEnable = TRUE;
trashEnable = true;
}
mMoveDownButton->setEnabled(resortEnable);
@ -726,7 +726,7 @@ void FloaterAO::onClickTrash()
void FloaterAO::updateCycleParameters()
{
BOOL enabled = mCycleCheckBox->getValue().asBoolean();
bool enabled = mCycleCheckBox->getValue().asBoolean();
mRandomizeCheckBox->setEnabled(enabled);
mCycleTimeTextLabel->setEnabled(enabled);
mCycleTimeSpinner->setEnabled(enabled);
@ -784,11 +784,11 @@ void FloaterAO::onClickMore()
mMore = true;
mSmallInterfacePanel->setVisible(FALSE);
mMainInterfacePanel->setVisible(TRUE);
setCanResize(TRUE);
mSmallInterfacePanel->setVisible(false);
mMainInterfacePanel->setVisible(true);
setCanResize(true);
gSavedPerAccountSettings.setBOOL("UseFullAOInterface", TRUE);
gSavedPerAccountSettings.setBOOL("UseFullAOInterface", true);
reshape(getRect().getWidth(), fullSize.getHeight());
}
@ -803,11 +803,11 @@ void FloaterAO::onClickLess()
mMore = false;
mSmallInterfacePanel->setVisible(TRUE);
mMainInterfacePanel->setVisible(FALSE);
setCanResize(FALSE);
mSmallInterfacePanel->setVisible(true);
mMainInterfacePanel->setVisible(false);
setCanResize(false);
gSavedPerAccountSettings.setBOOL("UseFullAOInterface", FALSE);
gSavedPerAccountSettings.setBOOL("UseFullAOInterface", false);
reshape(getRect().getWidth(), smallSize.getHeight());

46
indra/newview/aoengine.cpp
View File

@ -78,8 +78,8 @@ AOEngine::~AOEngine()
void AOEngine::init()
{
BOOL do_enable = gSavedPerAccountSettings.getBOOL("UseAO");
BOOL do_enable_stands = gSavedPerAccountSettings.getBOOL("UseAOStands");
bool do_enable = gSavedPerAccountSettings.getBOOL("UseAO");
bool do_enable_stands = gSavedPerAccountSettings.getBOOL("UseAOStands");
if (do_enable)
{
// enable_stands() calls enable(), but we need to set the
@ -107,7 +107,7 @@ void AOEngine::onToggleAOControl()
if (mEnabled)
{
// Enabling the AO always enables stands to start with
gSavedPerAccountSettings.setBOOL("UseAOStands", TRUE);
gSavedPerAccountSettings.setBOOL("UseAOStands", true);
}
}
@ -237,7 +237,7 @@ bool AOEngine::foreignAnimations()
// get the source's root prim
LLViewerObject* sourceRoot = dynamic_cast<LLViewerObject*>(source->getRoot());
// if the root prim is the same as the animation source, report back as TRUE
// if the root prim is the same as the animation source, report back as true
if (sourceRoot && sourceRoot->getID() == seat)
{
LL_DEBUGS("AOEngine") << "foreign animation " << animation_id << " found on seat." << LL_ENDL;
@ -985,8 +985,8 @@ void AOEngine::updateSortOrder(AOSet::AOState* state)
LLPointer<LLViewerInventoryItem> newItem = new LLViewerInventoryItem(item);
newItem->setDescription(numStr.str());
newItem->setComplete(TRUE);
newItem->updateServer(FALSE);
newItem->setComplete(true);
newItem->updateServer(false);
gInventory.updateItem(newItem);
}
@ -1002,8 +1002,8 @@ void AOEngine::addSet(const std::string& name, inventory_func_type callback, boo
return;
}
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
bool wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
LL_DEBUGS("AOEngine") << "adding set folder " << name << LL_ENDL;
gInventory.createNewCategory(mAOFolder, LLFolderType::FT_NONE, name, [callback, wasProtected](const LLUUID &new_cat_id)
{
@ -1047,8 +1047,8 @@ void AOEngine::addAnimation(const AOSet* set, AOSet::AOState* state, const LLInv
anim.mSortOrder = state->mAnimations.size() + 1;
state->mAnimations.emplace_back(std::move(anim));
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
bool wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
bool success = createAnimationLink(state, item);
gSavedPerAccountSettings.setBOOL("LockAOFolders", wasProtected);
@ -1073,7 +1073,7 @@ void AOEngine::addAnimation(const AOSet* set, AOSet::AOState* state, const LLInv
gInventory.createNewCategory(set->getInventoryUUID(), LLFolderType::FT_NONE, state->mName, [this, state, reload, wasProtected](const LLUUID &new_cat_id)
{
state->mInventoryUUID = new_cat_id;
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
// add all queued animations to this state's folder and then clear the queue
for (const auto item : state->mAddQueue)
@ -1113,8 +1113,8 @@ bool AOEngine::findForeignItems(const LLUUID& uuid) const
}
// count backwards in case we have to remove items
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
bool wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
if (items)
{
@ -1159,8 +1159,8 @@ bool AOEngine::findForeignItems(const LLUUID& uuid) const
void AOEngine::purgeFolder(const LLUUID& uuid) const
{
// unprotect it
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
bool wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
// move everything that's not an animation link to "lost and found"
if (findForeignItems(uuid))
@ -1691,12 +1691,12 @@ void AOEngine::saveSet(const AOSet* set)
LLViewerInventoryCategory* cat=gInventory.getCategory(set->getInventoryUUID());
LL_WARNS("AOEngine") << cat << LL_ENDL;
cat->rename(setParams);
cat->updateServer(FALSE);
cat->updateServer(false);
gInventory.addChangedMask(LLInventoryObserver::LABEL, cat->getUUID());
gInventory.notifyObservers();
*/
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
bool wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
rename_category(&gInventory, set->getInventoryUUID(), setParams);
gSavedPerAccountSettings.setBOOL("LockAOFolders", wasProtected);
@ -1735,8 +1735,8 @@ void AOEngine::saveState(const AOSet::AOState* state)
stateParams += ":RN";
}
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
bool wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", false);
rename_category(&gInventory, state->mInventoryUUID, stateParams);
gSavedPerAccountSettings.setBOOL("LockAOFolders", wasProtected);
}
@ -2021,7 +2021,7 @@ bool AOEngine::importNotecard(const LLInventoryItem* item)
item->getType(),
&onNotecardLoadComplete,
(void*) newUUID,
TRUE
true
);
return true;
@ -2050,7 +2050,7 @@ void AOEngine::onNotecardLoadComplete(const LLUUID& assetUUID, LLAssetType::ETyp
char* buffer = new char[notecardSize + 1];
buffer[notecardSize] = 0;
BOOL ret = file.read((U8*)buffer, notecardSize);
bool ret = file.read((U8*)buffer, notecardSize);
if (ret)
{
AOEngine::instance().parseNotecard(buffer);
@ -2426,7 +2426,7 @@ bool AOTimerCollection::tick()
AOEngine::instance().processImport(true);
}
// always return FALSE or the LLEventTimer will be deleted -> crash
// always return false or the LLEventTimer will be deleted -> crash
return false;
}

16
indra/newview/chatbar_as_cmdline.cpp
View File

@ -77,7 +77,7 @@ LLViewerInventoryItem::item_array_t findInventoryInFolder(std::string_view ifold
LLUUID folder = gInventory.findCategoryByName(static_cast<std::string>(ifolder));
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
gInventory.collectDescendents(folder, cats, items, FALSE);
gInventory.collectDescendents(folder, cats, items, false);
return items;
}
@ -529,7 +529,7 @@ static void invrepair()
{
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
gInventory.collectDescendents(gInventory.getRootFolderID(), cats, items, FALSE);
gInventory.collectDescendents(gInventory.getRootFolderID(), cats, items, false);
}
static void key_to_name_callback(const LLUUID& id, const LLAvatarName& av_name)
@ -598,7 +598,7 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
if (from_gesture)
{
report_to_nearby_chat(LLTrans::getString("DrawDistanceSteppingGestureObsolete"));
gSavedSettings.setBOOL("FSRenderFarClipStepping", TRUE);
gSavedSettings.setBOOL("FSRenderFarClipStepping", true);
return false;
}
F32 drawDist;
@ -683,7 +683,7 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
if (status == "on")
{
gSavedPerAccountSettings.setBOOL("UseAO", TRUE);
gSavedPerAccountSettings.setBOOL("UseAO", true);
// <FS:Zi> send appropriate enable/disable messages to nearby chat - FIRE-24160
if (!aoWasEnabled)
@ -693,7 +693,7 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
}
else if (status == "off")
{
gSavedPerAccountSettings.setBOOL("UseAO", FALSE);
gSavedPerAccountSettings.setBOOL("UseAO", false);
// <FS:Zi> send appropriate enable/disable messages to nearby chat - FIRE-24160
if (aoWasEnabled)
@ -709,11 +709,11 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
{
if (status == "off")
{
AOEngine::instance().setOverrideSits(tmp, TRUE);
AOEngine::instance().setOverrideSits(tmp, true);
}
else if (status == "on")
{
AOEngine::instance().setOverrideSits(tmp, FALSE);
AOEngine::instance().setOverrideSits(tmp, false);
}
}
else
@ -1815,7 +1815,7 @@ void cmdline_rezplat(bool use_saved_value, F32 visual_radius) //cmdline_rezplat(
msg->addVector3Fast(_PREHASH_RayStart, rezpos);
msg->addVector3Fast(_PREHASH_RayEnd, rezpos);
msg->addU8Fast(_PREHASH_BypassRaycast, (U8)1);
msg->addU8Fast(_PREHASH_RayEndIsIntersection, (U8)FALSE);
msg->addU8Fast(_PREHASH_RayEndIsIntersection, (U8)0);
msg->addU8Fast(_PREHASH_State, 0);
msg->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null);
msg->sendReliable(gAgent.getRegionHost());

2
indra/newview/daeexport.cpp
View File

@ -377,7 +377,7 @@ ColladaExportFloater::CacheReadResponder::CacheReadResponder(const LLUUID& id, L
setImage(image);
}
void ColladaExportFloater::CacheReadResponder::setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal)
void ColladaExportFloater::CacheReadResponder::setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal)
{
if (imageformat == IMG_CODEC_TGA && mFormattedImage->getCodec() == IMG_CODEC_J2C)
{

2
indra/newview/daeexport.h
View File

@ -164,7 +164,7 @@ private:
public:
CacheReadResponder(const LLUUID& id, LLImageFormatted* image, std::string name, S32 img_type);
void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal);
void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal);
virtual void completed(bool success);
static void saveTexturesWorker(void* data);
};

32
indra/newview/fsareasearch.cpp
View File

@ -773,7 +773,7 @@ void FSAreaSearch::processObjectProperties(LLMessageSystem* msg)
details.permissions.init(details.creator_id, details.owner_id, details.last_owner_id, details.group_id);
details.permissions.initMasks(details.base_mask, details.owner_mask, details.everyone_mask, details.group_mask, details.next_owner_mask);
// Sets the group owned BOOL and real owner id, group or owner depending if object is group owned.
// Sets the group owned bool and real owner id, group or owner depending if object is group owned.
details.permissions.getOwnership(details.ownership_id, details.group_owned);
LL_DEBUGS("FSAreaSearch_spammy") << "Got properties for object: " << object_id << LL_ENDL;
@ -1520,7 +1520,7 @@ void FSPanelAreaSearchList::updateResultListColumns()
U32 column_config = gSavedSettings.getU32("FSAreaSearchColumnConfig");
std::vector<LLScrollListColumn::Params> column_params = mResultList->getColumnInitParams();
std::string current_sort_col = mResultList->getSortColumnName();
BOOL current_sort_asc = mResultList->getSortAscending();
bool current_sort_asc = mResultList->getSortAscending();
mResultList->clearColumns();
mResultList->updateLayout();
@ -1667,13 +1667,13 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata)
if (action == "select_all")
{
std::vector<LLScrollListItem*> result_items = mResultList->getAllData();
std::for_each(result_items.begin(), result_items.end(), [](LLScrollListItem* item) { item->setSelected(TRUE); });
std::for_each(result_items.begin(), result_items.end(), [](LLScrollListItem* item) { item->setSelected(true); });
return true;
}
if (action == "clear_selection")
{
std::vector<LLScrollListItem*> selected_items = mResultList->getAllSelected();
std::for_each(selected_items.begin(), selected_items.end(), [](LLScrollListItem* item) { item->setSelected(FALSE); });
std::for_each(selected_items.begin(), selected_items.end(), [](LLScrollListItem* item) { item->setSelected(false); });
return true;
}
if (action == "filter_my_objects")
@ -1785,7 +1785,7 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata)
LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true); // Fixes an edge case where if the user has JUST disabled flycam themselves, the camera gets stuck waiting for input.
gAgentCamera.setFocusOnAvatar(FALSE, ANIMATE);
gAgentCamera.setFocusOnAvatar(false, ANIMATE);
gAgentCamera.setLookAt(LOOKAT_TARGET_SELECT, objectp);
@ -1921,7 +1921,7 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata)
}
FSObjectProperties& details = mFSAreaSearch->mObjectDetails[object_id];
node->mValid = TRUE;
node->mValid = true;
node->mPermissions->init(details.creator_id, details.owner_id, details.last_owner_id, details.group_id);
node->mPermissions->initMasks(details.base_mask, details.owner_mask, details.everyone_mask, details.group_mask, details.next_owner_mask);
node->mAggregatePerm = details.ag_perms;
@ -1977,7 +1977,7 @@ void FSPanelAreaSearchList::buyObject(FSObjectProperties& details, LLViewerObjec
if (node)
{
node->mValid = TRUE;
node->mValid = true;
node->mPermissions->init(details.creator_id, details.owner_id, details.last_owner_id, details.group_id);
node->mPermissions->initMasks(details.base_mask, details.owner_mask, details.everyone_mask, details.group_mask, details.next_owner_mask);
node->mSaleInfo = details.sale_info;
@ -2188,13 +2188,13 @@ void FSPanelAreaSearchFilter::onCommitCheckbox()
if (mCheckboxExcludePhysics->get())
{
mFSAreaSearch->setFilterPhysical(false);
mCheckboxPhysical->set(FALSE);
mCheckboxPhysical->setEnabled(FALSE);
mCheckboxPhysical->set(false);
mCheckboxPhysical->setEnabled(false);
mFSAreaSearch->setExcludePhysics(true);
}
else
{
mCheckboxPhysical->setEnabled(TRUE);
mCheckboxPhysical->setEnabled(true);
mFSAreaSearch->setExcludePhysics(false);
}
mFSAreaSearch->setFilterPhysical(mCheckboxPhysical->get());
@ -2202,13 +2202,13 @@ void FSPanelAreaSearchFilter::onCommitCheckbox()
if (mCheckboxExcludetemporary->get())
{
mFSAreaSearch->setFilterTemporary(false);
mCheckboxTemporary->set(FALSE);
mCheckboxTemporary->setEnabled(FALSE);
mCheckboxTemporary->set(false);
mCheckboxTemporary->setEnabled(false);
mFSAreaSearch->setExcludetemporary(true);
}
else
{
mCheckboxTemporary->setEnabled(TRUE);
mCheckboxTemporary->setEnabled(true);
mFSAreaSearch->setExcludetemporary(false);
}
mFSAreaSearch->setFilterTemporary(mCheckboxTemporary->get());
@ -2216,13 +2216,13 @@ void FSPanelAreaSearchFilter::onCommitCheckbox()
if (mCheckboxExcludeAttachment->get())
{
mFSAreaSearch->setFilterAttachment(false);
mCheckboxAttachment->set(FALSE);
mCheckboxAttachment->setEnabled(FALSE);
mCheckboxAttachment->set(false);
mCheckboxAttachment->setEnabled(false);
mFSAreaSearch->setExcludeAttachment(true);
}
else
{
mCheckboxAttachment->setEnabled(TRUE);
mCheckboxAttachment->setEnabled(true);
mFSAreaSearch->setExcludeAttachment(false);
}
mFSAreaSearch->setFilterAttachment(mCheckboxAttachment->get());

12
indra/newview/fschathistory.cpp
View File

@ -104,7 +104,7 @@ public:
}
LLUUID object_id;
if (!object_id.set(params[0], FALSE))
if (!object_id.set(params[0], false))
{
return false;
}
@ -651,7 +651,7 @@ public:
if (mInfoCtrl)
{
mInfoCtrl->setCommitCallback(boost::bind(&FSChatHistoryHeader::onClickInfoCtrl, mInfoCtrl));
mInfoCtrl->setVisible(FALSE);
mInfoCtrl->setVisible(false);
}
else
{
@ -777,7 +777,7 @@ public:
updateMinUserNameWidth();
LLColor4 sep_color = LLUIColorTable::instance().getColor("ChatTeleportSeparatorColor");
setTransparentColor(sep_color);
mTimeBoxTextBox->setVisible(FALSE);
mTimeBoxTextBox->setVisible(false);
}
else if (chat.mFromName.empty()
//|| mSourceType == CHAT_SOURCE_SYSTEM
@ -960,7 +960,7 @@ public:
mUserNameTextBox->reshape(user_name_rect.getWidth(), user_name_rect.getHeight());
mUserNameTextBox->setRect(user_name_rect);
mTimeBoxTextBox->setVisible(TRUE);
mTimeBoxTextBox->setVisible(true);
}
LLPanel::draw();
@ -1142,7 +1142,7 @@ protected:
void hideInfoCtrl()
{
mInfoCtrl->setVisible(FALSE);
mInfoCtrl->setVisible(false);
}
private:
@ -1290,7 +1290,7 @@ void FSChatHistory::updateChatInputLine()
}
#if LL_SDL2
void FSChatHistory::setFocus(BOOL b)
void FSChatHistory::setFocus(bool b)
{
LLTextEditor::setFocus(b);

2
indra/newview/fschathistory.h
View File

@ -104,7 +104,7 @@ class FSChatHistory : public LLTextEditor // <FS:Zi> FIRE-8600: TAB out of chat
#if LL_SDL2
// IME - International input compositing, i.e. for Japanese / Chinese text input
/* virtual */ void setFocus(BOOL b);
/* virtual */ void setFocus(bool b);
#endif
LLSD getValue() const;

6
indra/newview/fscommon.cpp
View File

@ -224,7 +224,7 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
{
if (item->getType() == LLAssetType::AT_LSL_TEXT)
{
LLToolDragAndDrop::dropScript(object, item, TRUE,
LLToolDragAndDrop::dropScript(object, item, true,
LLToolDragAndDrop::SOURCE_AGENT,
gAgentID);
}
@ -251,7 +251,7 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
gMessageSystem->nextBlockFast(_PREHASH_HeaderData);
gMessageSystem->addBOOLFast(_PREHASH_Override, FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Override, false);
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_NEXT_OWNER);
@ -278,7 +278,7 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, gSavedSettings.getBOOL("FSBuildPrefs_Physical"));
gMessageSystem->addBOOL(_PREHASH_IsTemporary, gSavedSettings.getBOOL("FSBuildPrefs_Temporary"));
gMessageSystem->addBOOL(_PREHASH_IsPhantom, gSavedSettings.getBOOL("FSBuildPrefs_Phantom"));
gMessageSystem->addBOOL("CastsShadows", FALSE);
gMessageSystem->addBOOL("CastsShadows", false);
gMessageSystem->sendReliable(object->getRegion()->getHost());
}

6
indra/newview/fsdata.cpp
View File

@ -943,7 +943,7 @@ void FSData::sendInfo(const LLUUID& destination, const LLUUID& sessionid, const
pack_instant_message(
gMessageSystem,
gAgentID,
FALSE,
false,
gAgentSessionID,
destination,
my_name,
@ -956,7 +956,7 @@ void FSData::sendInfo(const LLUUID& destination, const LLUUID& sessionid, const
pack_instant_message(
gMessageSystem,
gAgentID,
FALSE,
false,
gAgentSessionID,
destination,
my_name,
@ -992,7 +992,7 @@ void FSData::callbackReqInfo(const LLSD &notification, const LLSD &response)
pack_instant_message(
gMessageSystem,
gAgentID,
FALSE,
false,
gAgentSessionID,
from_id,
my_name,

4
indra/newview/fsfloateravatarrendersettings.cpp
View File

@ -170,10 +170,10 @@ void FSFloaterAvatarRenderSettings::onClickAdd(const LLSD& userdata)
render_setting = LLVOAvatar::AV_ALWAYS_RENDER;
}
LLView* button = findChild<LLButton>("plus_btn", TRUE);
LLView* button = findChild<LLButton>("plus_btn", true);
LLFloater* root_floater = gFloaterView->getParentFloater(this);
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSFloaterAvatarRenderSettings::callbackAvatarPicked, this, _1, render_setting),
TRUE, TRUE, TRUE, root_floater->getName(), button);
true, true, true, root_floater->getName(), button);
if (root_floater)
{

28
indra/newview/fsfloatercontacts.cpp
View File

@ -208,7 +208,7 @@ bool FSFloaterContacts::handleKeyHere(KEY key, MASK mask)
}
else if (getActiveTabName() == GROUP_TAB_NAME)
{
mGroupFilter->setFocus(TRUE);
mGroupFilter->setFocus(true);
return true;
}
}
@ -390,7 +390,7 @@ void FSFloaterContacts::onAvatarPicked(const uuid_vec_t& ids, const std::vector<
void FSFloaterContacts::onAddFriendWizButtonClicked(LLUICtrl* ctrl)
{
// Show add friend wizard.
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSFloaterContacts::onAvatarPicked, _1, _2), FALSE, TRUE, TRUE, "", ctrl);
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSFloaterContacts::onAvatarPicked, _1, _2), false, true, true, "", ctrl);
// Need to disable 'ok' button when friend occurs in selection
if (picker)
{
@ -531,16 +531,16 @@ void FSFloaterContacts::sortFriendList()
mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mName;
mFriendsList->sortByColumn(std::string("display_name"), TRUE);
mFriendsList->sortByColumn(std::string("display_name"), true);
}
else
{
mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName;
mFriendsList->sortByColumn(std::string("user_name"), TRUE);
mFriendsList->sortByColumn(std::string("user_name"), true);
}
mFriendsList->sortByColumn(std::string("icon_online_status"), FALSE);
mFriendsList->sortByColumn(std::string("icon_online_status"), false);
}
@ -778,7 +778,7 @@ void FSFloaterContacts::updateFriendItem(const LLUUID& agent_id, const LLRelatio
itemp->getColumn(LIST_FRIEND_UPDATE_GEN)->setValue(change_generation);
// enable this item, in case it was disabled after user input
itemp->setEnabled(TRUE);
itemp->setEnabled(true);
}
void FSFloaterContacts::updateFriendItem(const LLUUID& agent_id, const LLRelationship* relationship, const LLUUID& request_id)
@ -1007,7 +1007,7 @@ void FSFloaterContacts::applyRightsToFriends()
rights &= ~LLRelationship::GRANT_ONLINE_STATUS;
rights &= ~LLRelationship::GRANT_MAP_LOCATION;
// propagate rights constraint to UI
(*itr)->getColumn(LIST_VISIBLE_MAP)->setValue(FALSE);
(*itr)->getColumn(LIST_VISIBLE_MAP)->setValue(false);
}
}
if (buddy_relationship->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION) != show_map_location)
@ -1018,7 +1018,7 @@ void FSFloaterContacts::applyRightsToFriends()
// ONLINE_STATUS necessary for MAP_LOCATION
rights |= LLRelationship::GRANT_MAP_LOCATION;
rights |= LLRelationship::GRANT_ONLINE_STATUS;
(*itr)->getColumn(LIST_VISIBLE_ONLINE)->setValue(TRUE);
(*itr)->getColumn(LIST_VISIBLE_ONLINE)->setValue(false);
}
else
{
@ -1049,7 +1049,7 @@ void FSFloaterContacts::applyRightsToFriends()
rights_updates.insert(std::make_pair(id, rights));
// disable these ui elements until response from server
// to avoid race conditions
(*itr)->setEnabled(FALSE);
(*itr)->setEnabled(false);
}
}
@ -1235,16 +1235,16 @@ void FSFloaterContacts::onColumnDisplayModeChanged(const std::string& settings_n
mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mName;
mFriendsList->sortByColumn(std::string("display_name"), TRUE);
mFriendsList->sortByColumn(std::string("display_name"), true);
}
else
{
mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_DISPLAY_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName;
mFriendsList->getColumn(LIST_FRIEND_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName;
mFriendsList->sortByColumn(std::string("user_name"), TRUE);
mFriendsList->sortByColumn(std::string("user_name"), true);
}
mFriendsList->sortByColumn(std::string("icon_online_status"), FALSE);
mFriendsList->sortByColumn(std::string("icon_online_status"), false);
mFriendsList->setSearchColumn(mFriendsList->getColumn("full_name")->mIndex);
}
@ -1309,7 +1309,7 @@ void FSFloaterContacts::disconnectAvatarNameCacheConnection(const LLUUID& reques
}
}
BOOL FSFloaterContacts::handleFriendsListDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
bool FSFloaterContacts::handleFriendsListDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
@ -1342,7 +1342,7 @@ BOOL FSFloaterContacts::handleFriendsListDragAndDrop(S32 x, S32 y, MASK mask, BO
}
}
return TRUE;
return true;
}
void FSFloaterContacts::onFriendFilterEdit(const std::string& search_string)

2
indra/newview/fsfloatercontacts.h
View File

@ -114,7 +114,7 @@ private:
// misc callbacks
static void onAvatarPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
void onColumnDisplayModeChanged(const std::string& settings_name = "");
BOOL handleFriendsListDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
bool handleFriendsListDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,

4
indra/newview/fsfloatercontactsetconfiguration.cpp
View File

@ -82,8 +82,8 @@ void FSFloaterContactSetConfiguration::draw()
void FSFloaterContactSetConfiguration::onOpen(const LLSD& target_set)
{
mSetSwatch->set(LGGContactSets::getInstance()->getSetColor(mContactSet), TRUE);
mGlobalSwatch->set(LGGContactSets::getInstance()->getDefaultColor(), TRUE);
mSetSwatch->set(LGGContactSets::getInstance()->getSetColor(mContactSet), true);
mGlobalSwatch->set(LGGContactSets::getInstance()->getDefaultColor(), true);
mNotificationCheckBox->set(LGGContactSets::getInstance()->getNotifyForSet(mContactSet));
}

8
indra/newview/fsfloaterdiscord.cpp
View File

@ -118,8 +118,8 @@ void FSFloaterDiscord::showConnectButton()
{
if (!mConnectButton->getVisible())
{
mConnectButton->setVisible(TRUE);
mDisconnectButton->setVisible(FALSE);
mConnectButton->setVisible(true);
mDisconnectButton->setVisible(false);
}
}
@ -127,8 +127,8 @@ void FSFloaterDiscord::hideConnectButton()
{
if (mConnectButton->getVisible())
{
mConnectButton->setVisible(FALSE);
mDisconnectButton->setVisible(TRUE);
mConnectButton->setVisible(false);
mDisconnectButton->setVisible(true);
}
}

16
indra/newview/fsfloaterexport.cpp
View File

@ -187,7 +187,7 @@ void FSFloaterObjectExport::onIdle()
LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_id, FTT_DEFAULT, MIPMAP_TRUE);
image->setBoostLevel(LLViewerTexture::BOOST_MAX_LEVEL);
image->forceToSaveRawImage(0);
image->setLoadedCallback(FSFloaterObjectExport::onImageLoaded, 0, TRUE, FALSE, this, &mCallbackTextureList);
image->setLoadedCallback(FSFloaterObjectExport::onImageLoaded, 0, true, false, this, &mCallbackTextureList);
LL_DEBUGS("export") << "re-requested texture " << texture_id.asString() << LL_ENDL;
}
@ -669,13 +669,13 @@ bool FSFloaterObjectExport::exportTexture(const LLUUID& texture_id)
LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_id, FTT_DEFAULT, MIPMAP_TRUE);
image->setBoostLevel(LLViewerTexture::BOOST_MAX_LEVEL);
image->forceToSaveRawImage(0);
image->setLoadedCallback(FSFloaterObjectExport::onImageLoaded, 0, TRUE, FALSE, this, &mCallbackTextureList);
image->setLoadedCallback(FSFloaterObjectExport::onImageLoaded, 0, true, false, this, &mCallbackTextureList);
return true;
}
// static
void FSFloaterObjectExport::onImageLoaded(BOOL success, LLViewerFetchedTexture* src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata)
void FSFloaterObjectExport::onImageLoaded(bool success, LLViewerFetchedTexture* src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, bool final, void* userdata)
{
if(final && success)
{
@ -822,7 +822,7 @@ void FSFloaterObjectExport::inventoryChanged(LLViewerObject* object, LLInventory
item->getType(),
onLoadComplete,
data,
TRUE);
true);
}
else
{
@ -830,7 +830,7 @@ void FSFloaterObjectExport::inventoryChanged(LLViewerObject* object, LLInventory
item->getType(),
onLoadComplete,
data,
TRUE);
true);
}
}
}
@ -936,7 +936,7 @@ void FSFloaterObjectExport::onLoadComplete(const LLUUID& asset_uuid, LLAssetType
LLAssetType::AT_ANIMATION,
onLoadComplete,
anim_data,
TRUE);
true);
}
break;
case STEP_SOUND:
@ -959,7 +959,7 @@ void FSFloaterObjectExport::onLoadComplete(const LLUUID& asset_uuid, LLAssetType
LLAssetType::AT_SOUND,
onLoadComplete,
sound_data,
TRUE);
true);
}
break;
default:
@ -1245,7 +1245,7 @@ mParent(parent)
setImage(image);
}
void FSFloaterObjectExport::FSExportCacheReadResponder::setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal)
void FSFloaterObjectExport::FSExportCacheReadResponder::setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal)
{
if (imageformat != IMG_CODEC_J2C)
{

6
indra/newview/fsfloaterexport.h
View File

@ -56,12 +56,12 @@ public:
bool postBuild();
void updateSelection();
static void onImageLoaded(BOOL success,
static void onImageLoaded(bool success,
LLViewerFetchedTexture *src_vi,
LLImageRaw* src,
LLImageRaw* aux_src,
S32 discard_level,
BOOL final,
bool final,
void* userdata);
void fetchTextureFromCache(LLViewerFetchedTexture* src_vi);
void saveFormattedImage(LLPointer<LLImageFormatted> mFormattedImage, LLUUID id);
@ -143,7 +143,7 @@ private:
public:
FSExportCacheReadResponder(const LLUUID& id, LLImageFormatted* image, FSFloaterObjectExport* parent);
void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal);
void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, bool imagelocal);
virtual void completed(bool success);
private:

76
indra/newview/fsfloaterim.cpp
View File

@ -145,13 +145,13 @@ FSFloaterIM::FSFloaterIM(const LLUUID& session_id)
mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelAdHocControl, this);
break;
case IM_SESSION_GROUP_START:
setCanSnooze(TRUE);
setCanSnooze(true);
mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this);
break;
case IM_SESSION_INVITE:
if (gAgent.isInGroup(mSessionID))
{
setCanSnooze(TRUE);
setCanSnooze(true);
mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this);
}
else
@ -538,7 +538,7 @@ void FSFloaterIM::sendMsg(const std::string& msg)
}
LLSpeakerMgr::speaker_list_t speakers;
pIMSession->mSpeakers->getSpeakerList(&speakers, TRUE);
pIMSession->mSpeakers->getSpeakerList(&speakers, true);
for (const auto& pSpeaker : speakers)
{
if ( (gAgent.getID() != pSpeaker->mID) && (!RlvActions::canSendIM(pSpeaker->mID)) )
@ -659,7 +659,7 @@ void FSFloaterIM::doToSelected(const LLSD& userdata)
{
if (gSavedSettings.getBOOL("FSUseBuiltInHistory"))
{
LLFloaterReg::showInstance("preview_conversation", mSessionID, TRUE);
LLFloaterReg::showInstance("preview_conversation", mSessionID, true);
}
else
{
@ -714,7 +714,7 @@ void FSFloaterIM::onSysinfoButtonClicked()
LLNotificationsUtil::add("SendSysinfoToIM",args,LLSD(),boost::bind(&FSFloaterIM::onSendSysinfo,this,_1,_2));
}
BOOL FSFloaterIM::onSendSysinfo(const LLSD& notification, const LLSD& response)
bool FSFloaterIM::onSendSysinfo(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification,response);
@ -733,9 +733,9 @@ BOOL FSFloaterIM::onSendSysinfo(const LLSD& notification, const LLSD& response)
mQueuedMsgsForInit.append(part1);
mQueuedMsgsForInit.append(part2);
}
return TRUE;
return true;
}
return FALSE;
return false;
}
void FSFloaterIM::onSysinfoButtonVisibilityChanged(const LLSD& yes)
@ -762,14 +762,14 @@ void FSFloaterIM::updateCallButton()
if (!session)
{
getChild<LLButton>("call_btn")->setEnabled(FALSE);
getChild<LLButton>("call_btn")->setEnabled(false);
return;
}
bool session_initialized = session->mSessionInitialized;
bool callback_enabled = session->mCallBackEnabled;
BOOL enable_connect = session_initialized
bool enable_connect = session_initialized
&& voice_enabled
&& callback_enabled;
@ -794,15 +794,15 @@ void FSFloaterIM::changed(U32 mask)
bool is_online = LLAvatarTracker::instance().isBuddyOnline(mOtherParticipantUUID);
getChild<LLButton>("teleport_btn")->setEnabled(is_online);
getChild<LLButton>("call_btn")->setEnabled(is_online);
getChild<LLButton>("add_friend_btn")->setEnabled(FALSE);
getChild<LLButton>("add_friend_btn")->setEnabled(false);
}
else
{
// If friendship dissolved, enable buttons by default because we don't
// know about their online status anymore
getChild<LLButton>("teleport_btn")->setEnabled(TRUE);
getChild<LLButton>("call_btn")->setEnabled(TRUE);
getChild<LLButton>("add_friend_btn")->setEnabled(TRUE);
getChild<LLButton>("teleport_btn")->setEnabled(true);
getChild<LLButton>("call_btn")->setEnabled(true);
getChild<LLButton>("add_friend_btn")->setEnabled(true);
}
}
@ -987,7 +987,7 @@ bool FSFloaterIM::postBuild()
LLIMModel::instance().findIMSession(mSessionID);
if (im_session && !im_session->mTextIMPossible)
{
mInputEditor->setEnabled(FALSE);
mInputEditor->setEnabled(false);
mInputEditor->setLabel(LLTrans::getString("IM_unavailable_text_label"));
}
@ -1097,7 +1097,7 @@ void FSFloaterIM::timedUpdate()
if (mMeTypingTimer.getElapsedTimeF32() > ME_TYPING_TIMEOUT && false == mShouldSendTypingState && mDialog == IM_NOTHING_SPECIAL)
{
LL_DEBUGS("TypingMsgs") << "Send additional Start Typing packet" << LL_ENDL;
LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, TRUE);
LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, true);
mMeTypingTimer.reset();
}
@ -1209,14 +1209,14 @@ FSFloaterIM* FSFloaterIM::show(const LLUUID& session_id)
if (floater_container)
{
floater_container->addFloater(floater, TRUE, i_pt);
floater_container->addFloater(floater, true, i_pt);
}
}
floater->mApplyRect = false;
floater->openFloater(floater->getKey());
floater->mApplyRect = true;
floater->setFocus(TRUE);
floater->setFocus(true);
}
else
{
@ -1256,7 +1256,7 @@ FSFloaterIM* FSFloaterIM::show(const LLUUID& session_id)
}
// window is positioned, now we can show it.
floater->setVisible(TRUE);
floater->setVisible(true);
}
return floater;
@ -1356,7 +1356,7 @@ bool FSFloaterIM::getVisible()
return LLTransientDockableFloater::getVisible();
}
// getVisible() returns TRUE when Tabbed IM window is minimized.
// getVisible() returns true when Tabbed IM window is minimized.
return is_active && !im_container->isMinimized() && im_container->getVisible();
}
else
@ -1380,8 +1380,8 @@ bool FSFloaterIM::toggle(const LLUUID& session_id)
}
else if (floater && (!floater->isDocked() || (floater->getVisible() && !floater->hasFocus())))
{
floater->setVisible(TRUE);
floater->setFocus(TRUE);
floater->setVisible(true);
floater->setFocus(true);
return true;
}
}
@ -1630,7 +1630,7 @@ void FSFloaterIM::setTyping(bool typing)
if ( mTypingTimer.getElapsedTimeF32() > 1.f )
{
// Still typing, send 'start typing' notification
LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, TRUE);
LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, true);
mShouldSendTypingState = false;
mMeTypingTimer.reset();
}
@ -1638,17 +1638,17 @@ void FSFloaterIM::setTyping(bool typing)
else
{
// Send 'stop typing' notification immediately
LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, FALSE);
LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, false);
mShouldSendTypingState = false;
}
}
LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
if (speaker_mgr)
speaker_mgr->setSpeakerTyping(gAgent.getID(), FALSE);
speaker_mgr->setSpeakerTyping(gAgent.getID(), false);
}
void FSFloaterIM::processIMTyping(const LLUUID& from_id, BOOL typing)
void FSFloaterIM::processIMTyping(const LLUUID& from_id, bool typing)
{
if (typing)
{
@ -1690,7 +1690,7 @@ void FSFloaterIM::processAgentListUpdates(const LLSD& body)
// process the moderator mutes
if (agent_id == gAgentID && agent_data.has("info") && agent_data["info"].has("mutes"))
{
BOOL moderator_muted_text = agent_data["info"]["mutes"]["text"].asBoolean();
bool moderator_muted_text = agent_data["info"]["mutes"]["text"].asBoolean();
mInputEditor->setEnabled(!moderator_muted_text);
std::string label;
if (moderator_muted_text)
@ -1966,14 +1966,14 @@ bool FSFloaterIM::handleKeyHere( KEY key, MASK mask )
return handled;
}
BOOL FSFloaterIM::isInviteAllowed() const
bool FSFloaterIM::isInviteAllowed() const
{
return ( (IM_SESSION_CONFERENCE_START == mDialog)
|| (IM_SESSION_INVITE == mDialog && !gAgent.isInGroup(mSessionID))
|| mIsP2PChat);
}
BOOL FSFloaterIM::inviteToSession(const uuid_vec_t& ids)
bool FSFloaterIM::inviteToSession(const uuid_vec_t& ids)
{
LLViewerRegion* region = gAgent.getRegion();
bool is_region_exist = region != NULL;
@ -2027,7 +2027,7 @@ void FSFloaterIM::addTypingIndicator(const LLUUID& from_id)
LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
if ( speaker_mgr )
{
speaker_mgr->setSpeakerTyping(from_id, TRUE);
speaker_mgr->setSpeakerTyping(from_id, true);
}
}
}
@ -2047,7 +2047,7 @@ void FSFloaterIM::removeTypingIndicator(const LLUUID& from_id)
LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
if ( speaker_mgr )
{
speaker_mgr->setSpeakerTyping(from_id, FALSE);
speaker_mgr->setSpeakerTyping(from_id, false);
}
}
// Ansariel: Transplant of STORM-1975; Typing notifications are only sent in P2P sessions,
@ -2059,7 +2059,7 @@ void FSFloaterIM::removeTypingIndicator(const LLUUID& from_id)
LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
if ( speaker_mgr )
{
speaker_mgr->setSpeakerTyping(mOtherParticipantUUID, FALSE);
speaker_mgr->setSpeakerTyping(mOtherParticipantUUID, false);
}
}
}
@ -2194,14 +2194,14 @@ void FSFloaterIM::onClickCloseBtn(bool app_quitting)
}
// <FS:Zi> Viewer version popup
BOOL FSFloaterIM::enableViewerVersionCallback(const LLSD& notification,const LLSD& response)
bool FSFloaterIM::enableViewerVersionCallback(const LLSD& notification,const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification,response);
BOOL result = FALSE;
bool result = false;
if (option == 0) // "yes"
{
result = TRUE;
result = true;
}
gSavedSettings.setBOOL("FSSupportGroupChatPrefix3", result);
@ -2250,7 +2250,7 @@ void FSFloaterIM::initIMSession(const LLUUID& session_id)
void FSFloaterIM::reshapeChatLayoutPanel()
{
mChatLayoutPanel->reshape(mChatLayoutPanel->getRect().getWidth(), mInputEditor->getRect().getHeight() + mInputEditorPad, FALSE);
mChatLayoutPanel->reshape(mChatLayoutPanel->getRect().getWidth(), mInputEditor->getRect().getHeight() + mInputEditorPad, false);
}
boost::signals2::connection FSFloaterIM::setIMFloaterShowedCallback(const floater_showed_signal_t::slot_type& cb)
@ -2262,12 +2262,12 @@ void FSFloaterIM::updateUnreadMessageNotification(S32 unread_messages)
{
if (unread_messages == 0 || !gSavedSettings.getBOOL("FSNotifyUnreadIMMessages"))
{
mUnreadMessagesNotificationPanel->setVisible(FALSE);
mUnreadMessagesNotificationPanel->setVisible(false);
}
else
{
mUnreadMessagesNotificationTextBox->setTextArg("[NUM]", llformat("%d", unread_messages));
mUnreadMessagesNotificationPanel->setVisible(TRUE);
mUnreadMessagesNotificationPanel->setVisible(true);
}
}
@ -2275,7 +2275,7 @@ void FSFloaterIM::onAddButtonClicked()
{
LLView* button = findChild<LLButton>("add_participant_btn");
LLFloater* root_floater = this;
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSFloaterIM::addSessionParticipants, this, _1), TRUE, TRUE, FALSE, root_floater->getName(), button);
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSFloaterIM::addSessionParticipants, this, _1), true, true, false, root_floater->getName(), button);
if (!picker)
{
return;

10
indra/newview/fsfloaterim.h
View File

@ -111,7 +111,7 @@ public:
bool focusFirstItem(bool prefer_text_fields = false, bool focus_flash = true );
void onVisibilityChange(bool new_visibility);
void processIMTyping(const LLUUID& from_id, BOOL typing);
void processIMTyping(const LLUUID& from_id, bool typing);
void processAgentListUpdates(const LLSD& body);
void updateChatHistoryStyle();
@ -171,7 +171,7 @@ protected:
LLButton* mSysinfoButton;
// support sysinfo button -Zi
BOOL enableViewerVersionCallback(const LLSD& notification,const LLSD& response); // <FS:Zi> Viewer version popup
bool enableViewerVersionCallback(const LLSD& notification,const LLSD& response); // <FS:Zi> Viewer version popup
void reshapeChatLayoutPanel();
private:
// process focus events to set a currently active session
@ -189,8 +189,8 @@ private:
bool dropCategory(LLInventoryCategory* category, bool drop);
bool dropPerson(LLUUID* person_id, bool drop);
BOOL isInviteAllowed() const;
BOOL inviteToSession(const uuid_vec_t& agent_ids);
bool isInviteAllowed() const;
bool inviteToSession(const uuid_vec_t& agent_ids);
void onInputEditorFocusReceived();
void onInputEditorFocusLost();
@ -201,7 +201,7 @@ private:
// support sysinfo button -Zi
void onSysinfoButtonClicked();
BOOL onSendSysinfo(const LLSD& notification,const LLSD& response);
bool onSendSysinfo(const LLSD& notification,const LLSD& response);
// support sysinfo button -Zi
// connection to voice channel state change signal

18
indra/newview/fsfloaterimcontainer.cpp
View File

@ -52,7 +52,7 @@ FSFloaterIMContainer::FSFloaterIMContainer(const LLSD& seed)
mForceVoiceStateUpdate(false),
mIsAddingNewSession(false)
{
mAutoResize = FALSE;
mAutoResize = false;
LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, this);
// Firstly add our self to IMSession observers, so we catch session events
@ -163,7 +163,7 @@ void FSFloaterIMContainer::onOpen(const LLSD& key)
LLFloater* active_floater = getActiveFloater();
if (active_floater && !active_floater->hasFocus())
{
mTabContainer->setFocus(TRUE);
mTabContainer->setFocus(true);
}
}
@ -312,8 +312,8 @@ void FSFloaterIMContainer::removeFloater(LLFloater* floaterp)
{
mTabContainer->unlockTabs();
}
gSavedSettings.setBOOL(setting_name, TRUE);
floaterp->setCanClose(TRUE);
gSavedSettings.setBOOL(setting_name, true);
floaterp->setCanClose(true);
}
LLMultiFloater::removeFloater(floaterp);
}
@ -336,11 +336,11 @@ void FSFloaterIMContainer::onCloseFloater(LLUUID& id)
mSessions.erase(id);
if (isShown())
{
setFocus(TRUE);
setFocus(true);
}
else if (isMinimized())
{
setMinimized(TRUE); // Make sure console output that needs to be shown is still doing so
setMinimized(true); // Make sure console output that needs to be shown is still doing so
}
}
@ -356,9 +356,9 @@ void FSFloaterIMContainer::onNewMessageReceived(const LLSD& data)
{
if (LLMultiFloater::isFloaterFlashing(floaterp))
{
LLMultiFloater::setFloaterFlashing(floaterp, FALSE);
LLMultiFloater::setFloaterFlashing(floaterp, false);
}
LLMultiFloater::setFloaterFlashing(floaterp, TRUE);
LLMultiFloater::setFloaterFlashing(floaterp, true);
}
}
@ -401,7 +401,7 @@ void FSFloaterIMContainer::setMinimized(bool b)
}
//virtual
void FSFloaterIMContainer::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg)
void FSFloaterIMContainer::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, bool has_offline_msg)
{
LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id);
if (!session)

2
indra/newview/fsfloaterimcontainer.h
View File

@ -65,7 +65,7 @@ public:
void onNewMessageReceived(const LLSD& data); // public so nearbychat can call it directly. TODO: handle via callback. -AO
virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg);
virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, bool has_offline_msg);
virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {};
virtual void sessionVoiceOrIMStarted(const LLUUID& session_id) {};
virtual void sessionRemoved(const LLUUID& session_id);

66
indra/newview/fsfloaterimport.cpp
View File

@ -193,7 +193,7 @@ void FSFloaterImport::onIdle()
LL_DEBUGS("import") << "Dropping " << item_queue.item->getName() << " " << item_queue.item->getUUID() << " into " << item_queue.prim_name << " " << item_queue.object->getID() << LL_ENDL;
if (item_queue.item->getType() == LLAssetType::AT_LSL_TEXT)
{
LLToolDragAndDrop::dropScript(item_queue.object, item_queue.item, TRUE,
LLToolDragAndDrop::dropScript(item_queue.object, item_queue.item, true,
LLToolDragAndDrop::SOURCE_AGENT,
gAgentID);
}
@ -298,17 +298,17 @@ void FSFloaterImport::loadFile()
LL_DEBUGS("import") << "Linkset size is " << mLinksetSize << LL_ENDL;
if (mLinksetSize != 0)
{
getChild<LLButton>("import_btn")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(TRUE);
getChild<LLButton>("import_btn")->setEnabled(true);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(true);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(true);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(true);
}
else
{
getChild<LLButton>("import_btn")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(FALSE);
getChild<LLButton>("import_btn")->setEnabled(false);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(false);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(false);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(false);
}
}
@ -506,11 +506,11 @@ void FSFloaterImport::onClickBtnImport()
LL_DEBUGS("import") << "mStartPosition is " << mStartPosition << LL_ENDL;
// don't allow change during a long upload/import
getChild<LLButton>("import_btn")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(FALSE);
getChild<LLButton>("import_btn")->setEnabled(false);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(false);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(false);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(false);
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(false);
if (((mTexturesTotal + mSoundsTotal + mAnimsTotal + mAssetsTotal) != 0) && getChild<LLCheckBoxCtrl>("upload_asset")->get())
{
@ -527,10 +527,10 @@ void FSFloaterImport::onClickBtnImport()
LLBuyCurrencyHTML::openCurrencyFloater(LLTrans::getString("UploadingCosts", args), expected_upload_cost);
// re-enable the controls
getChild<LLButton>("import_btn")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(TRUE);
getChild<LLButton>("import_btn")->setEnabled(true);
getChild<LLCheckBoxCtrl>("do_not_attach")->setEnabled(true);
getChild<LLCheckBoxCtrl>("region_position")->setEnabled(true);
getChild<LLCheckBoxCtrl>("upload_asset")->setEnabled(true);
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(getChild<LLCheckBoxCtrl>("upload_asset")->get());
return;
}
@ -587,15 +587,15 @@ void FSFloaterImport::onClickCheckBoxUploadAsset()
{
if (getChild<LLCheckBoxCtrl>("upload_asset")->get())
{
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(TRUE);
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(true);
LLUIString stats = getString("upload_cost");
stats.setArg("[COST]", llformat("%u", (mTexturesTotal * LLAgentBenefitsMgr::current().getTextureUploadCost() + mSoundsTotal * LLAgentBenefitsMgr::current().getSoundUploadCost() + mAnimsTotal * LLAgentBenefitsMgr::current().getAnimationUploadCost())));
getChild<LLTextBox>("file_status_text")->setText(stats.getString());
}
else
{
getChild<LLCheckBoxCtrl>("temp_asset")->set(FALSE);
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(FALSE);
getChild<LLCheckBoxCtrl>("temp_asset")->set(false);
getChild<LLCheckBoxCtrl>("temp_asset")->setEnabled(false);
std::string text;
getChild<LLTextBox>("file_status_text")->setText(text);
}
@ -712,8 +712,8 @@ void FSFloaterImport::createPrim()
gMessageSystem->addVector3Fast(_PREHASH_RayStart, position);
gMessageSystem->addVector3Fast(_PREHASH_RayEnd, position);
gMessageSystem->addU8Fast(_PREHASH_BypassRaycast, (U8)TRUE);
gMessageSystem->addU8Fast(_PREHASH_RayEndIsIntersection, (U8)FALSE);
gMessageSystem->addU8Fast(_PREHASH_BypassRaycast, (U8)1);
gMessageSystem->addU8Fast(_PREHASH_RayEndIsIntersection, (U8)0);
gMessageSystem->addU8Fast(_PREHASH_State, (U8)0);
gMessageSystem->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null);
gMessageSystem->sendReliable(gAgent.getRegion()->getHost());
@ -727,7 +727,7 @@ bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
return false;
}
LLSelectMgr::getInstance()->selectObjectAndFamily(object, TRUE);
LLSelectMgr::getInstance()->selectObjectAndFamily(object, true);
LLUUID prim_uuid = mManifest["linkset"][mLinkset][mObject].asUUID();
LLSD& prim = mManifest["prim"][prim_uuid.asString()];
@ -890,7 +890,7 @@ bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
gMessageSystem->nextBlockFast(_PREHASH_HeaderData);
gMessageSystem->addBOOLFast(_PREHASH_Override, (BOOL)FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Override, false);
if (prim.has("group_mask"))
{
@ -899,7 +899,7 @@ bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_GROUP);
gMessageSystem->addBOOLFast(_PREHASH_Set, (BOOL)(group_mask & PERM_MODIFY) ? TRUE : FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (bool)(group_mask & PERM_MODIFY) ? true : false);
gMessageSystem->addU32Fast(_PREHASH_Mask, PERM_MODIFY | PERM_MOVE | PERM_COPY);
}
if (prim.has("everyone_mask"))
@ -909,12 +909,12 @@ bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_EVERYONE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (BOOL)(everyone_mask & PERM_MOVE) ? TRUE : FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (bool)(everyone_mask & PERM_MOVE) ? true : false);
gMessageSystem->addU32Fast(_PREHASH_Mask, PERM_MOVE);
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_EVERYONE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (BOOL)(everyone_mask & PERM_COPY) ? TRUE : FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (bool)(everyone_mask & PERM_COPY) ? true : false);
gMessageSystem->addU32Fast(_PREHASH_Mask, PERM_COPY);
}
if (prim.has("next_owner_mask"))
@ -924,17 +924,17 @@ bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_NEXT_OWNER);
gMessageSystem->addBOOLFast(_PREHASH_Set, (BOOL)(next_owner_mask & PERM_MODIFY) ? TRUE : FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (bool)(next_owner_mask & PERM_MODIFY) ? true : false);
gMessageSystem->addU32Fast(_PREHASH_Mask, PERM_MODIFY);
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_NEXT_OWNER);
gMessageSystem->addBOOLFast(_PREHASH_Set, (BOOL)(next_owner_mask & PERM_COPY) ? TRUE : FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (bool)(next_owner_mask & PERM_COPY) ? true : false);
gMessageSystem->addU32Fast(_PREHASH_Mask, PERM_COPY);
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_NEXT_OWNER);
gMessageSystem->addBOOLFast(_PREHASH_Set, (BOOL)(next_owner_mask & PERM_TRANSFER) ? TRUE : FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Set, (bool)(next_owner_mask & PERM_TRANSFER) ? true : false);
gMessageSystem->addU32Fast(_PREHASH_Mask, PERM_TRANSFER);
}
@ -982,7 +982,7 @@ bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
object->setPhysicsFriction(friction);
object->setPhysicsDensity(density);
object->setPhysicsRestitution(restitution);
object->updateFlags(TRUE);
object->updateFlags(true);
}
}
@ -1636,7 +1636,7 @@ void FSFloaterImport::onAssetUploadComplete(const LLUUID& uuid, void* userdata,
new_item->setDescription(data->mAssetInfo.getDescription());
new_item->setTransactionID(data->mAssetInfo.mTransactionID);
new_item->setAssetUUID(asset_id);
new_item->updateServer(FALSE);
new_item->updateServer(false);
gInventory.updateItem(new_item);
gInventory.notifyObservers();
LL_DEBUGS("import") << "Asset " << asset_id << " saved into " << "inventory item " << item->getName() << LL_ENDL;

2
indra/newview/fsfloaterimport.h
View File

@ -125,7 +125,7 @@ private:
uuid_vec_t mAssetQueue;
U32 mAssetsTotal;
std::map<LLUUID,LLUUID> mAssetMap;
BOOL mSavedSettingShowNewInventory;
bool mSavedSettingShowNewInventory;
boost::signals2::connection mObjectCreatedCallback;
struct FSInventoryQueue

26
indra/newview/fsfloaternearbychat.cpp
View File

@ -111,11 +111,11 @@ void FSFloaterNearbyChat::updateFSUseNearbyChatConsole(const LLSD &data)
if (FSUseNearbyChatConsole)
{
removeScreenChat();
gConsole->setVisible(TRUE);
gConsole->setVisible(true);
}
else
{
gConsole->setVisible(FALSE);
gConsole->setVisible(false);
}
}
@ -191,7 +191,7 @@ void FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
LLChat& tmp_chat = const_cast<LLChat&>(chat);
bool use_plain_text_chat_history = gSavedSettings.getBOOL("PlainTextChatHistory");
bool show_timestamps_nearby_chat = gSavedSettings.getBOOL("FSShowTimestampsNearbyChat");
// [FIRE-1641 : SJ]: Option to hide timestamps in nearby chat - add Timestamp when show_timestamps_nearby_chat is TRUE
// [FIRE-1641 : SJ]: Option to hide timestamps in nearby chat - add Timestamp when show_timestamps_nearby_chat is true
if (show_timestamps_nearby_chat)
{
if (tmp_chat.mTimeStr.empty())
@ -232,7 +232,7 @@ void FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
// KC: Don't flash tab on system messages
if (!isInVisibleChain() && hostp && (chat.mSourceType == CHAT_SOURCE_AGENT || chat.mSourceType == CHAT_SOURCE_OBJECT))
{
hostp->setFloaterFlashing(this, TRUE);
hostp->setFloaterFlashing(this, true);
}
}
@ -360,7 +360,7 @@ void FSFloaterNearbyChat::openFloater(const LLSD& key)
{
floater_container->showFloater(this, LLTabContainer::START);
}
setVisible(TRUE);
setVisible(true);
LLFloater::openFloater(key);
}
}
@ -447,7 +447,7 @@ void FSFloaterNearbyChat::onOpen(const LLSD& key )
floater_container->setVisible(true);
floater_container->showFloater(this, LLTabContainer::START);
}
setVisible(TRUE);
setVisible(true);
}
LLFloater::onOpen(key);
@ -658,7 +658,7 @@ bool FSFloaterNearbyChat::getVisible()
return LLFloater::getVisible();
}
// getVisible() returns TRUE when Tabbed IM window is minimized.
// getVisible() returns true when Tabbed IM window is minimized.
return is_active && !im_container->isMinimized() && im_container->getVisible();
}
@ -750,7 +750,7 @@ void FSFloaterNearbyChat::onChatBoxFocusReceived()
void FSFloaterNearbyChat::reshapeChatLayoutPanel()
{
mChatLayoutPanel->reshape(mChatLayoutPanel->getRect().getWidth(), mInputEditor->getRect().getHeight() + mInputEditorPad, FALSE);
mChatLayoutPanel->reshape(mChatLayoutPanel->getRect().getWidth(), mInputEditor->getRect().getHeight() + mInputEditorPad, false);
}
void FSFloaterNearbyChat::sendChat( EChatType type )
@ -864,7 +864,7 @@ void FSFloaterNearbyChat::onChatTypeChanged()
mSendChatButton->setLabel(mChatTypeCombo->getSelectedItemLabel());
}
void FSFloaterNearbyChat::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
void FSFloaterNearbyChat::sendChatFromViewer(const std::string &utf8text, EChatType type, bool animate)
{
LLWString wtext = utf8string_to_wstring(utf8text);
S32 channel = 0;
@ -888,14 +888,14 @@ void FSFloaterNearbyChat::stopChat()
FSFloaterNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<FSFloaterNearbyChat>("fs_nearby_chat");
if (nearby_chat)
{
nearby_chat->mInputEditor->setFocus(FALSE);
nearby_chat->mInputEditor->setFocus(false);
gAgent.stopTyping();
}
}
void FSFloaterNearbyChat::updateUnreadMessageNotification(S32 unread_messages, bool muted_history)
{
BOOL show_muted_history = gSavedSettings.getBOOL("FSShowMutedChatHistory");
bool show_muted_history = gSavedSettings.getBOOL("FSShowMutedChatHistory");
if (muted_history)
{
@ -916,12 +916,12 @@ void FSFloaterNearbyChat::updateUnreadMessageNotification(S32 unread_messages, b
if (unread_messages == 0 || !gSavedSettings.getBOOL("FSNotifyUnreadChatMessages"))
{
mUnreadMessagesNotificationPanel->setVisible(FALSE);
mUnreadMessagesNotificationPanel->setVisible(false);
}
else
{
mUnreadMessagesNotificationTextBox->setTextArg("[NUM]", llformat("%d", unread_messages));
mUnreadMessagesNotificationPanel->setVisible(TRUE);
mUnreadMessagesNotificationPanel->setVisible(true);
}
}

4
indra/newview/fsfloaternearbychat.h
View File

@ -107,7 +107,7 @@ protected:
void onChatBoxFocusReceived();
void sendChat( EChatType type );
void sendChatFromViewer(const std::string& utf8text, EChatType type, BOOL animate);
void sendChatFromViewer(const std::string& utf8text, EChatType type, bool animate);
void onChatBoxCommit();
void onChatTypeChanged();
@ -144,7 +144,7 @@ private:
std::vector<LLChat> mMessageArchive;
BOOL FSUseNearbyChatConsole;
bool FSUseNearbyChatConsole;
};
#endif // FS_FLOATERNEARBYCHAT_H

24
indra/newview/fsfloaterperformance.cpp
View File

@ -211,8 +211,8 @@ void FSFloaterPerformance::setHardwareDefaults()
void FSFloaterPerformance::showSelectedPanel(LLPanel* selected_panel)
{
hidePanels();
mMainPanel->setVisible(FALSE);
selected_panel->setVisible(TRUE);
mMainPanel->setVisible(false);
selected_panel->setVisible(true);
if (mHUDsPanel == selected_panel)
{
@ -436,16 +436,16 @@ void FSFloaterPerformance::draw()
void FSFloaterPerformance::showMainPanel()
{
hidePanels();
mMainPanel->setVisible(TRUE);
mMainPanel->setVisible(true);
}
void FSFloaterPerformance::hidePanels()
{
mNearbyPanel->setVisible(FALSE);
mComplexityPanel->setVisible(FALSE);
mHUDsPanel->setVisible(FALSE);
mSettingsPanel->setVisible(FALSE);
mAutoTunePanel->setVisible(FALSE);
mNearbyPanel->setVisible(false);
mComplexityPanel->setVisible(false);
mHUDsPanel->setVisible(false);
mSettingsPanel->setVisible(false);
mAutoTunePanel->setVisible(false);
}
void FSFloaterPerformance::initBackBtn(LLPanel* panel)
@ -561,7 +561,7 @@ void FSFloaterPerformance::populateHUDList()
}
}
mHUDList->sortByColumnIndex(1, FALSE);
mHUDList->sortByColumnIndex(1, false);
mHUDList->setScrollPos(prev_pos);
mHUDList->selectItemBySpecialId(prev_selected_id);
}
@ -572,7 +572,7 @@ void FSFloaterPerformance::populateObjectList()
auto prev_selected_id = mObjectList->getSelectedSpecialId();
std::string current_sort_col = mObjectList->getSortColumnName();
BOOL current_sort_asc = mObjectList->getSortAscending();
bool current_sort_asc = mObjectList->getSortAscending();
mObjectList->clearRows();
mObjectList->updateColumns(true);
@ -696,7 +696,7 @@ void FSFloaterPerformance::populateNearbyList()
S32 prev_pos = mNearbyList->getScrollPos();
LLUUID prev_selected_id = mNearbyList->getStringUUIDSelectedItem();
std::string current_sort_col = mNearbyList->getSortColumnName();
BOOL current_sort_asc = mNearbyList->getSortAscending();
bool current_sort_asc = mNearbyList->getSortAscending();
if (current_sort_col == "art_visual")
{
@ -1088,7 +1088,7 @@ void FSFloaterPerformance::onExtendedAction(const LLSD& userdata, const LLUUID&
LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true); // Fixes an edge case where if the user has JUST disabled flycam themselves, the camera gets stuck waiting for input.
gAgentCamera.setFocusOnAvatar(FALSE, ANIMATE);
gAgentCamera.setFocusOnAvatar(false, ANIMATE);
gAgentCamera.setLookAt(LOOKAT_TARGET_SELECT, objectp);

68
indra/newview/fsfloaterplacedetails.cpp
View File

@ -293,10 +293,10 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key)
mPanelLandmarkInfo->resetLocation();
mPanelLandmarkInfo->setInfoType(LLPanelPlaceInfo::LANDMARK);
mPanelLandmarkInfo->setHeaderVisible(FALSE);
mPanelLandmarkInfo->setHeaderVisible(false);
mPanelPlaceInfo->setVisible(FALSE);
mPanelLandmarkInfo->setVisible(TRUE);
mPanelPlaceInfo->setVisible(false);
mPanelLandmarkInfo->setVisible(true);
setItem(item);
}
@ -319,11 +319,11 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key)
LLUUID dest_folder = key["dest_folder"];
mPanelLandmarkInfo->resetLocation();
mPanelLandmarkInfo->setInfoAndCreateLandmark(dest_folder);
mPanelLandmarkInfo->setHeaderVisible(FALSE);
mPanelLandmarkInfo->setHeaderVisible(false);
mPanelLandmarkInfo->displayParcelInfo(LLUUID(), mGlobalPos);
mPanelPlaceInfo->setVisible(FALSE);
mPanelLandmarkInfo->setVisible(TRUE);
mPanelPlaceInfo->setVisible(false);
mPanelLandmarkInfo->setVisible(true);
mIsInCreateMode = true;
updateVerbs();
@ -335,9 +335,9 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key)
mPanelPlaceInfo->resetLocation();
mPanelPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE);
mPanelPlaceInfo->setHeaderVisible(FALSE);
mPanelPlaceInfo->setVisible(TRUE);
mPanelLandmarkInfo->setVisible(FALSE);
mPanelPlaceInfo->setHeaderVisible(false);
mPanelPlaceInfo->setVisible(true);
mPanelLandmarkInfo->setVisible(false);
if (key.has("id"))
{
@ -387,9 +387,9 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key)
mPanelPlaceInfo->setInfoType(LLPanelPlaceInfo::TELEPORT_HISTORY);
mPanelPlaceInfo->displayParcelInfo(LLUUID(), mGlobalPos);
mPanelPlaceInfo->setHeaderVisible(FALSE);
mPanelPlaceInfo->setVisible(TRUE);
mPanelLandmarkInfo->setVisible(FALSE);
mPanelPlaceInfo->setHeaderVisible(false);
mPanelPlaceInfo->setVisible(true);
mPanelLandmarkInfo->setVisible(false);
updateVerbs();
}
@ -401,9 +401,9 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key)
mPanelPlaceInfo->resetLocation();
mPanelPlaceInfo->setInfoType(LLPanelPlaceInfo::AGENT);
mPanelPlaceInfo->setHeaderVisible(FALSE);
mPanelPlaceInfo->setVisible(TRUE);
mPanelLandmarkInfo->setVisible(FALSE);
mPanelPlaceInfo->setHeaderVisible(false);
mPanelPlaceInfo->setVisible(true);
mPanelLandmarkInfo->setVisible(false);
LLViewerParcelMgr* parcel_mgr = LLViewerParcelMgr::getInstance();
if (!parcel_mgr)
@ -450,23 +450,23 @@ void FSFloaterPlaceDetails::updateVerbs()
}
else if (mDisplayInfo == REMOTE_PLACE || mDisplayInfo == TELEPORT_HISTORY_ITEM)
{
getChildView("teleport_btn")->setVisible(TRUE);
getChildView("teleport_btn")->setVisible(true);
getChildView("teleport_btn")->setEnabled(RlvActions::canTeleportToLocation());
getChildView("map_btn")->setVisible(TRUE);
getChildView("edit_btn")->setVisible(FALSE);
getChildView("save_btn")->setVisible(FALSE);
getChildView("cancel_btn")->setVisible(FALSE);
getChildView("close_btn")->setVisible(FALSE);
getChildView("map_btn")->setVisible(true);
getChildView("edit_btn")->setVisible(false);
getChildView("save_btn")->setVisible(false);
getChildView("cancel_btn")->setVisible(false);
getChildView("close_btn")->setVisible(false);
}
else if (mDisplayInfo == AGENT)
{
getChildView("teleport_btn")->setVisible(TRUE);
getChildView("teleport_btn")->setVisible(true);
getChildView("teleport_btn")->setEnabled(have_position && !LLViewerParcelMgr::getInstance()->inAgentParcel(mGlobalPos));
getChildView("map_btn")->setVisible(TRUE);
getChildView("edit_btn")->setVisible(FALSE);
getChildView("save_btn")->setVisible(FALSE);
getChildView("cancel_btn")->setVisible(FALSE);
getChildView("close_btn")->setVisible(FALSE);
getChildView("map_btn")->setVisible(true);
getChildView("edit_btn")->setVisible(false);
getChildView("save_btn")->setVisible(false);
getChildView("cancel_btn")->setVisible(false);
getChildView("close_btn")->setVisible(false);
}
}
@ -534,7 +534,7 @@ void FSFloaterPlaceDetails::setItem(LLInventoryItem* item)
}
// Check if item is in agent's inventory and he has the permission to modify it.
BOOL is_landmark_editable = gInventory.isObjectDescendentOf(mItem->getUUID(), gInventory.getRootFolderID()) &&
bool is_landmark_editable = gInventory.isObjectDescendentOf(mItem->getUUID(), gInventory.getRootFolderID()) &&
mItem->getPermissions().allowModifyBy(gAgent.getID());
getChildView("edit_btn")->setEnabled(is_landmark_editable);
@ -641,7 +641,7 @@ void FSFloaterPlaceDetails::onShowOnMapButtonClicked()
void FSFloaterPlaceDetails::onEditButtonClicked()
{
mPanelLandmarkInfo->toggleLandmarkEditMode(TRUE);
mPanelLandmarkInfo->toggleLandmarkEditMode(true);
mIsInEditMode = true;
mIsInCreateMode = false;
updateVerbs();
@ -649,7 +649,7 @@ void FSFloaterPlaceDetails::onEditButtonClicked()
void FSFloaterPlaceDetails::onCancelButtonClicked()
{
mPanelLandmarkInfo->toggleLandmarkEditMode(FALSE);
mPanelLandmarkInfo->toggleLandmarkEditMode(false);
mIsInEditMode = false;
updateVerbs();
@ -683,7 +683,7 @@ void FSFloaterPlaceDetails::onSaveButtonClicked()
{
new_item->rename(current_title_value);
new_item->setDescription(current_notes_value);
new_item->updateServer(FALSE);
new_item->updateServer(false);
}
if(folder_id != mItem->getParentUUID())
@ -696,7 +696,7 @@ void FSFloaterPlaceDetails::onSaveButtonClicked()
gInventory.accountForUpdate(update);
new_item->setParent(folder_id);
new_item->updateParentOnServer(FALSE);
new_item->updateParentOnServer(false);
}
gInventory.updateItem(new_item);
@ -729,7 +729,7 @@ void FSFloaterPlaceDetails::onOverflowButtonClicked()
{
menu = mLandmarkMenu;
BOOL is_landmark_removable = FALSE;
bool is_landmark_removable = false;
if (mItem.notNull())
{
const LLUUID& item_id = mItem->getUUID();
@ -746,7 +746,7 @@ void FSFloaterPlaceDetails::onOverflowButtonClicked()
}
// TODO: What to do with the create pick stuff? Disabled for now...
menu->getChild<LLMenuItemCallGL>("pick")->setVisible(FALSE);
menu->getChild<LLMenuItemCallGL>("pick")->setVisible(false);
mOverflowBtn->setMenu(menu, LLMenuButton::MP_TOP_RIGHT);
}

2
indra/newview/fsfloaterposestand.cpp
View File

@ -87,7 +87,7 @@ void FSFloaterPoseStand::onClose(bool app_quitting)
setLock(false);
gAgent.standUp();
}
gAgent.setCustomAnim(FALSE);
gAgent.setCustomAnim(false);
FSPose::getInstance()->stopPose();
gAgent.stopCurrentAnimations(true);
if (mAOPaused && !gSavedPerAccountSettings.getBOOL("UseAO"))

164
indra/newview/fsfloatersearch.cpp
View File

@ -351,14 +351,14 @@ void FSFloaterSearch::onTabChange()
if (active_panel == mPanelPeople || active_panel == mPanelGroups)
{
mDetailSnapshotParcel->setVisible(FALSE);
mDetailSnapshot->setVisible(TRUE);
mDetailSnapshotParcel->setVisible(false);
mDetailSnapshot->setVisible(true);
}
else if (active_panel == mPanelPlaces || active_panel == mPanelLand ||
active_panel == mPanelEvents || active_panel == mPanelClassifieds)
{
mDetailSnapshot->setVisible(FALSE);
mDetailSnapshotParcel->setVisible(TRUE);
mDetailSnapshot->setVisible(false);
mDetailSnapshotParcel->setVisible(true);
}
}
@ -724,7 +724,7 @@ void FSFloaterSearch::onBtnTeleport()
}
else if (teleport_action == 2)
{
setMinimized(TRUE);
setMinimized(true);
}
}
}
@ -778,7 +778,7 @@ bool FSPanelSearchPeople::postBuild()
if (mSearchResults)
{
mSearchResults->setCommitCallback(boost::bind(&FSPanelSearchPeople::onSelectItem, this));
mSearchResults->setEnabled(FALSE);
mSearchResults->setEnabled(false);
mSearchResults->setCommentText(LLTrans::getString("no_results"));
mSearchResults->setContextMenu(&gFSAvatarSearchMenu);
}
@ -871,7 +871,7 @@ void FSPanelSearchPeople::onBtnFind()
void FSPanelSearchPeople::onBtnNext()
{
mStartSearch += RESULT_PAGE_SIZE;
getChildView("people_back")->setEnabled(TRUE);
getChildView("people_back")->setEnabled(true);
find();
}
@ -887,8 +887,8 @@ void FSPanelSearchPeople::onBtnBack()
void FSPanelSearchPeople::resetSearch()
{
mStartSearch = 0;
getChildView("people_back")->setEnabled(FALSE);
getChildView("people_next")->setEnabled(FALSE);
getChildView("people_back")->setEnabled(false);
getChildView("people_next")->setEnabled(false);
}
S32 FSPanelSearchPeople::showNextButton(S32 rows)
@ -957,25 +957,25 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("people_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
return;
}
else if (status & STATUS_SEARCH_PLACES_SHORTSTRING)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_short"));
return;
}
else if (status & STATUS_SEARCH_PLACES_BANNEDWORD)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_banned"));
return;
}
else if (status & STATUS_SEARCH_PLACES_SEARCHDISABLED)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_disabled"));
return;
}
@ -987,7 +987,7 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("people_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
@ -1006,13 +1006,13 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**)
LL_INFOS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL;
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("people_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
else
{
LL_DEBUGS("Search") << "Got: " << first_name << " " << last_name << " AgentID: " << agent_id << LL_ENDL;
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
found_one = true;
std::string avatar_name;
@ -1039,7 +1039,7 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**)
if (found_one)
{
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
self->onSelectItem();
}
}
@ -1074,16 +1074,16 @@ void FSPanelSearchPeople::onAvatarNameCallback(const LLUUID& id, const LLAvatarN
mResultsReceived = 1;
mNumResultsReturned = 1;
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
onSelectItem();
}
else
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = getChild<LLUICtrl>("people_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
}
@ -1218,7 +1218,7 @@ void FSPanelSearchGroups::onBtnFind()
void FSPanelSearchGroups::onBtnNext()
{
mStartSearch += RESULT_PAGE_SIZE;
getChildView("groups_back")->setEnabled(TRUE);
getChildView("groups_back")->setEnabled(true);
find();
}
@ -1234,8 +1234,8 @@ void FSPanelSearchGroups::onBtnBack()
void FSPanelSearchGroups::resetSearch()
{
mStartSearch = 0;
getChildView("groups_back")->setEnabled(FALSE);
getChildView("groups_next")->setEnabled(FALSE);
getChildView("groups_back")->setEnabled(false);
getChildView("groups_next")->setEnabled(false);
}
S32 FSPanelSearchGroups::showNextButton(S32 rows)
@ -1307,25 +1307,25 @@ void FSPanelSearchGroups::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("groups_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
return;
}
else if(status & STATUS_SEARCH_PLACES_SHORTSTRING)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_short"));
return;
}
else if (status & STATUS_SEARCH_PLACES_BANNEDWORD)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_banned"));
return;
}
else if (status & STATUS_SEARCH_PLACES_SEARCHDISABLED)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_disabled"));
return;
}
@ -1337,7 +1337,7 @@ void FSPanelSearchGroups::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("groups_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
@ -1355,13 +1355,13 @@ void FSPanelSearchGroups::processSearchReply(LLMessageSystem* msg, void**)
LL_DEBUGS("Search") << "No results returned for QueryID: " << query_id << LL_ENDL;
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("groups_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
else
{
LL_DEBUGS("Search") << "Got: " << group_name << " GroupID: " << group_id << LL_ENDL;
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
found_one = true;
LLSD content;
@ -1391,7 +1391,7 @@ void FSPanelSearchGroups::processSearchReply(LLMessageSystem* msg, void**)
if (found_one)
{
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
self->onSelectItem();
}
}
@ -1550,7 +1550,7 @@ void FSPanelSearchPlaces::onBtnFind()
void FSPanelSearchPlaces::onBtnNext()
{
mStartSearch += RESULT_PAGE_SIZE;
getChildView("places_back")->setEnabled(TRUE);
getChildView("places_back")->setEnabled(true);
find();
}
@ -1566,8 +1566,8 @@ void FSPanelSearchPlaces::onBtnBack()
void FSPanelSearchPlaces::resetSearch()
{
mStartSearch = 0;
getChildView("places_back")->setEnabled(FALSE);
getChildView("places_next")->setEnabled(FALSE);
getChildView("places_back")->setEnabled(false);
getChildView("places_next")->setEnabled(false);
}
S32 FSPanelSearchPlaces::showNextButton(S32 rows)
@ -1640,31 +1640,31 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("places_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
return;
}
else if(status & STATUS_SEARCH_PLACES_SHORTSTRING)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_short"));
return;
}
else if (status & STATUS_SEARCH_PLACES_BANNEDWORD)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_banned"));
return;
}
else if (status & STATUS_SEARCH_PLACES_SEARCHDISABLED)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_disabled"));
return;
}
else if (status & STATUS_SEARCH_PLACES_ESTATEEMPTY)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_disabled"));
return;
}
@ -1676,7 +1676,7 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("places_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
@ -1695,13 +1695,13 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**)
LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL;
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("places_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
else
{
LL_DEBUGS("Search") << "Got: " << name << " ParcelID: " << parcel_id << LL_ENDL;
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
found_one = true;
LLSD content;
@ -1744,7 +1744,7 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**)
if (found_one)
{
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
self->onSelectItem();
}
}
@ -1929,7 +1929,7 @@ void FSPanelSearchLand::onBtnFind()
void FSPanelSearchLand::onBtnNext()
{
mStartSearch += RESULT_PAGE_SIZE;
getChildView("land_back")->setEnabled(TRUE);
getChildView("land_back")->setEnabled(true);
find();
}
@ -1945,8 +1945,8 @@ void FSPanelSearchLand::onBtnBack()
void FSPanelSearchLand::resetSearch()
{
mStartSearch = 0;
getChildView("land_back")->setEnabled(FALSE);
getChildView("land_next")->setEnabled(FALSE);
getChildView("land_back")->setEnabled(false);
getChildView("land_next")->setEnabled(false);
}
S32 FSPanelSearchLand::showNextButton(S32 rows)
@ -2023,7 +2023,7 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("events_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
self->mResultsReceived += num_new_rows;
@ -2040,13 +2040,13 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**)
if (parcel_id.isNull())
{
LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL;
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("no_results"));
}
else
{
LL_DEBUGS("Search") << "Got: " << name << " ClassifiedID: " << parcel_id << LL_ENDL;
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
found_one = true;
if (msg->getSizeFast(_PREHASH_QueryReplies, i, _PREHASH_ProductSKU) > 0)
{
@ -2143,7 +2143,7 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**)
if (found_one)
{
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
self->onSelectItem();
}
}
@ -2228,7 +2228,7 @@ void FSPanelSearchClassifieds::find()
return;
}
U32 category = mClassifiedsCategory->getValue().asInteger();
BOOL auto_renew = FALSE;
bool auto_renew = false;
U32 flags = pack_classified_flags_request(auto_renew, inc_pg, inc_mature, inc_adult);
mResultsReceived = 0;
@ -2277,7 +2277,7 @@ void FSPanelSearchClassifieds::onBtnFind()
void FSPanelSearchClassifieds::onBtnNext()
{
mStartSearch += RESULT_PAGE_SIZE;
getChildView("classifieds_back")->setEnabled(TRUE);
getChildView("classifieds_back")->setEnabled(true);
find();
}
@ -2293,8 +2293,8 @@ void FSPanelSearchClassifieds::onBtnBack()
void FSPanelSearchClassifieds::resetSearch()
{
mStartSearch = 0;
getChildView("classifieds_back")->setEnabled(FALSE);
getChildView("classifieds_next")->setEnabled(FALSE);
getChildView("classifieds_back")->setEnabled(false);
getChildView("classifieds_next")->setEnabled(false);
}
S32 FSPanelSearchClassifieds::showNextButton(S32 rows)
@ -2377,25 +2377,25 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("classifieds_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
return;
}
else if(status & STATUS_SEARCH_PLACES_SHORTSTRING)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_short"));
return;
}
else if (status & STATUS_SEARCH_CLASSIFIEDS_BANNEDWORD)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_banned"));
return;
}
else if (status & STATUS_SEARCH_PLACES_SEARCHDISABLED)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_disabled"));
return;
}
@ -2407,7 +2407,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("classifieds_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
self->mResultsReceived += num_new_rows;
@ -2425,13 +2425,13 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**)
LL_DEBUGS("Search") << "Null result returned for QueryID: " << query_id << LL_ENDL;
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("classifieds_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
else
{
LL_DEBUGS("Search") << "Got: " << name << " ClassifiedID: " << classified_id << LL_ENDL;
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
found_one = true;
LLSD content;
@ -2458,7 +2458,7 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**)
if (found_one)
{
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
self->onSelectItem();
}
}
@ -2618,7 +2618,7 @@ void FSPanelSearchEvents::onBtnFind()
void FSPanelSearchEvents::onBtnNext()
{
mStartSearch += RESULT_PAGE_SIZE;
getChildView("events_back")->setEnabled(TRUE);
getChildView("events_back")->setEnabled(true);
find();
}
@ -2658,23 +2658,23 @@ void FSPanelSearchEvents::onBtnToday()
void FSPanelSearchEvents::resetSearch()
{
mStartSearch = 0;
getChildView("events_back")->setEnabled(FALSE);
getChildView("events_next")->setEnabled(FALSE);
getChildView("events_back")->setEnabled(false);
getChildView("events_next")->setEnabled(false);
}
void FSPanelSearchEvents::onSearchModeChanged()
{
if (mEventsMode->getValue().asString() == "current")
{
getChildView("events_yesterday")->setEnabled(FALSE);
getChildView("events_tomorrow")->setEnabled(FALSE);
getChildView("events_today")->setEnabled(FALSE);
getChildView("events_yesterday")->setEnabled(false);
getChildView("events_tomorrow")->setEnabled(false);
getChildView("events_today")->setEnabled(false);
}
else
{
getChildView("events_yesterday")->setEnabled(TRUE);
getChildView("events_tomorrow")->setEnabled(TRUE);
getChildView("events_today")->setEnabled(TRUE);
getChildView("events_yesterday")->setEnabled(true);
getChildView("events_tomorrow")->setEnabled(true);
getChildView("events_today")->setEnabled(true);
}
}
@ -2758,43 +2758,43 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("events_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
return;
}
else if(status & STATUS_SEARCH_EVENTS_SHORTSTRING)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_short"));
return;
}
else if (status & STATUS_SEARCH_EVENTS_BANNEDWORD)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_banned"));
return;
}
else if (status & STATUS_SEARCH_EVENTS_SEARCHDISABLED)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_disabled"));
return;
}
else if (status & STATUS_SEARCH_EVENTS_NODATEOFFSET)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_no_date_offset"));
return;
}
else if (status & STATUS_SEARCH_EVENTS_NOCATEGORY)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_no_events_category"));
return;
}
else if (status & STATUS_SEARCH_EVENTS_NOQUERY)
{
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("search_no_query"));
return;
}
@ -2805,7 +2805,7 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**)
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = self->getChild<LLUICtrl>("events_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setEnabled(false);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
@ -2851,7 +2851,7 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**)
LL_INFOS("Search") << "Skipped " << event_id << " because it was out of scope" << LL_ENDL;
continue;
}
search_results->setEnabled(TRUE);
search_results->setEnabled(true);
found_one = true;
LLSD content;
@ -2896,7 +2896,7 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**)
if (found_one)
{
search_results->selectFirstItem();
search_results->setFocus(TRUE);
search_results->setFocus(true);
self->onSelectItem();
}
}
@ -3057,7 +3057,7 @@ void FSPanelSearchWeb::loadURL(const SearchQuery &p)
void FSPanelSearchWeb::focusDefaultElement()
{
mWebBrowser->setFocus(TRUE);
mWebBrowser->setFocus(true);
}
void FSPanelSearchWeb::draw()

22
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -336,8 +336,8 @@ void FSFloaterVoiceControls::onParticipantSelected()
uuid_vec_t participants;
mAvatarList->getSelectedUUIDs(participants);
mVolumeSlider->setEnabled(FALSE);
mMuteButton->setEnabled(FALSE);
mVolumeSlider->setEnabled(false);
mMuteButton->setEnabled(false);
mSelectedParticipant=LLUUID::null;
@ -352,8 +352,8 @@ void FSFloaterVoiceControls::onParticipantSelected()
if(!LLVoiceClient::instance().getVoiceEnabled(mSelectedParticipant))
return;
mVolumeSlider->setEnabled(TRUE);
mMuteButton->setEnabled(TRUE);
mVolumeSlider->setEnabled(true);
mMuteButton->setEnabled(true);
mMuteButton->setToggleState(LLVoiceClient::instance().getOnMuteList(mSelectedParticipant));
mVolumeSlider->setValue(LLVoiceClient::instance().getUserVolume(mSelectedParticipant));
@ -607,7 +607,7 @@ void FSFloaterVoiceControls::updateParticipantsVoiceState()
LLPointer<LLSpeaker> speaker = mSpeakerManager->findSpeaker(participant_id);
if (speaker.isNull())
continue;
speaker->mHasLeftCurrentCall = FALSE;
speaker->mHasLeftCurrentCall = false;
speakers_uuids.erase(speakers_iter);
found = true;
@ -637,7 +637,7 @@ void FSFloaterVoiceControls::updateNotInVoiceParticipantState(LLAvatarListItem*
LLPointer<LLSpeaker> speaker = mSpeakerManager->findSpeaker(participant_id);
if (speaker.notNull())
{
speaker->mHasLeftCurrentCall = TRUE;
speaker->mHasLeftCurrentCall = true;
}
}
break;
@ -825,7 +825,7 @@ void FSFloaterVoiceControls::reset(const LLVoiceChannel::EState& new_state)
}
// Ansariel: Changed for RLVa @shownearby
//mAvatarList->setVisible(TRUE);
//mAvatarList->setVisible(true);
updateListVisibility();
mSpeakerManager = NULL;
@ -841,13 +841,13 @@ void FSFloaterVoiceControls::updateListVisibility()
{
if (mIsRlvShowNearbyRestricted && mVoiceType == VC_LOCAL_CHAT)
{
mAvatarList->setVisible(FALSE);
mRlvRestrictedText->setVisible(TRUE);
mAvatarList->setVisible(false);
mRlvRestrictedText->setVisible(true);
}
else
{
mAvatarList->setVisible(TRUE);
mRlvRestrictedText->setVisible(FALSE);
mAvatarList->setVisible(true);
mRlvRestrictedText->setVisible(false);
}
}
//EOF

2
indra/newview/fsgridhandler.cpp
View File

@ -884,7 +884,7 @@ void LLGridManager::addSystemGrid(const std::string& label,
if (name == std::string(MAINGRID))
{
grid_entry->grid[GRID_SLURL_BASE] = MAIN_GRID_SLURL_BASE;
grid_entry->grid[GRID_IS_FAVORITE_VALUE] = TRUE;
grid_entry->grid[GRID_IS_FAVORITE_VALUE] = true;
}
else
{

2
indra/newview/fskeywords.cpp
View File

@ -52,7 +52,7 @@ FSKeywords::~FSKeywords()
void FSKeywords::updateKeywords()
{
BOOL match_whole_words = gSavedPerAccountSettings.getBOOL("FSKeywordMatchWholeWords");
bool match_whole_words = gSavedPerAccountSettings.getBOOL("FSKeywordMatchWholeWords");
std::string s = gSavedPerAccountSettings.getString("FSKeywords");
if (!gSavedPerAccountSettings.getBOOL("FSKeywordCaseSensitive"))
{

35
indra/newview/fslslbridge.cpp
View File

@ -126,7 +126,7 @@ void FSLSLBridge::onIdle(void* userdata)
LLViewerInventoryItem* inv_object = gInventory.getItem(instance->mReattachBridgeUUID);
if (inv_object && instance->getBridge() && instance->getBridge()->getUUID() == inv_object->getUUID())
{
LLAttachmentsMgr::instance().addAttachmentRequest(inv_object->getUUID(), FS_BRIDGE_POINT, TRUE, TRUE);
LLAttachmentsMgr::instance().addAttachmentRequest(inv_object->getUUID(), FS_BRIDGE_POINT, true, true);
}
instance->mReattachBridgeUUID.setNull();
instance->setTimerResult(NO_TIMER);
@ -328,7 +328,6 @@ bool FSLSLBridge::lslToViewer(std::string_view message, const LLUUID& fromID, co
if (valuepos != std::string::npos)
{
// <FS:Zi> send appropriate enable/disable messages to nearby chat - FIRE-24160
// use BOOL to satisfy windows compiler
bool aoWasPaused = gSavedPerAccountSettings.getBOOL("PauseAO");
bool aoStandsWasEnabled = gSavedPerAccountSettings.getBOOL("UseAOStands");
// </FS:Zi>
@ -336,21 +335,21 @@ bool FSLSLBridge::lslToViewer(std::string_view message, const LLUUID& fromID, co
if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 2) == "on")
{
// <FS:Zi> Pause AO via bridge instead of switch AO on or off - FIRE-9305
gSavedPerAccountSettings.setBOOL("PauseAO", FALSE);
gSavedPerAccountSettings.setBOOL("UseAOStands", TRUE);
gSavedPerAccountSettings.setBOOL("PauseAO", false);
gSavedPerAccountSettings.setBOOL("UseAOStands", true);
}
else if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 3) == "off")
{
// <FS:Zi> Pause AO via bridge instead of switch AO on or off - FIRE-9305
gSavedPerAccountSettings.setBOOL("PauseAO", TRUE);
gSavedPerAccountSettings.setBOOL("PauseAO", true);
}
else if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 7) == "standon")
{
gSavedPerAccountSettings.setBOOL("UseAOStands", TRUE);
gSavedPerAccountSettings.setBOOL("UseAOStands", true);
}
else if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 8) == "standoff")
{
gSavedPerAccountSettings.setBOOL("UseAOStands", FALSE);
gSavedPerAccountSettings.setBOOL("UseAOStands", false);
}
else
{
@ -665,7 +664,7 @@ void FSLSLBridge::cleanUpPreCreation()
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
NameCollectFunctor namefunctor(mCurrentFullName);
gInventory.collectDescendentsIf(getBridgeFolder(), cats, items, FALSE, namefunctor);
gInventory.collectDescendentsIf(getBridgeFolder(), cats, items, false, namefunctor);
mAllowedDetachables.clear();
for (const auto& item : items)
@ -701,7 +700,7 @@ void FSLSLBridge::finishCleanUpPreCreation()
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
NameCollectFunctor namefunctor(mCurrentFullName);
gInventory.collectDescendentsIf(getBridgeFolder(), cats, items, FALSE, namefunctor);
gInventory.collectDescendentsIf(getBridgeFolder(), cats, items, false, namefunctor);
for (const auto& item : items)
{
@ -825,7 +824,7 @@ void FSLSLBridge::startCreation()
LL_INFOS("FSLSLBridge") << "Bridge not attached but found in inventory, reattaching..." << LL_ENDL;
//Is this a valid bridge - wear it.
LLAttachmentsMgr::instance().addAttachmentRequest(mpBridge->getUUID(), FS_BRIDGE_POINT, TRUE, TRUE);
LLAttachmentsMgr::instance().addAttachmentRequest(mpBridge->getUUID(), FS_BRIDGE_POINT, true, true);
//from here, the attach should report to ProcessAttach and make sure bridge is valid.
}
else
@ -1081,7 +1080,7 @@ void FSLSLBridge::processDetach(LLViewerObject* object, const LLViewerJointAttac
LLViewerInventoryItem* inv_object = gInventory.getItem(object->getAttachmentItemID());
if (inv_object && FSLSLBridge::instance().mpBridge && FSLSLBridge::instance().mpBridge->getUUID() == inv_object->getUUID())
{
LLAttachmentsMgr::instance().addAttachmentRequest(inv_object->getUUID(), FS_BRIDGE_POINT, TRUE, TRUE);
LLAttachmentsMgr::instance().addAttachmentRequest(inv_object->getUUID(), FS_BRIDGE_POINT, true, true);
}
return;
@ -1248,8 +1247,8 @@ void FSLSLBridgeRezCallback::fire(const LLUUID& inv_item)
LLViewerInventoryItem* item = gInventory.getItem(inv_item);
item->setDescription(item->getName());
item->setComplete(TRUE);
item->updateServer(FALSE);
item->setComplete(true);
item->updateServer(false);
gInventory.updateItem(item);
gInventory.notifyObservers();
@ -1258,7 +1257,7 @@ void FSLSLBridgeRezCallback::fire(const LLUUID& inv_item)
FSLSLBridge::instance().setBridge(item);
LL_INFOS("FSLSLBridge") << "Attaching bridge to the 'bridge' attachment point..." << LL_ENDL;
LLAttachmentsMgr::instance().addAttachmentRequest(inv_item, FS_BRIDGE_POINT, TRUE, TRUE);
LLAttachmentsMgr::instance().addAttachmentRequest(inv_item, FS_BRIDGE_POINT, true, true);
}
@ -1433,7 +1432,7 @@ void FSLSLBridge::checkBridgeScriptName()
}
LL_INFOS("FSLSLBridge") << "Saving script " << mScriptItemID.asString() << " in object" << LL_ENDL;
obj->saveScript(gInventory.getItem(mScriptItemID), TRUE, true);
obj->saveScript(gInventory.getItem(mScriptItemID), true, true);
new FSLSLBridgeCleanupTimer();
}
@ -1618,7 +1617,7 @@ LLViewerInventoryItem* FSLSLBridge::findInvObject(const std::string& obj_name, c
LLUUID itemID;
NameCollectFunctor namefunctor(obj_name);
gInventory.collectDescendentsIf(catID, cats, items, FALSE, namefunctor);
gInventory.collectDescendentsIf(catID, cats, items, false, namefunctor);
for (const auto& item : items)
{
@ -1654,7 +1653,7 @@ void FSLSLBridge::cleanUpBridgeFolder(const std::string& nameToCleanUp)
//find all bridge and script duplicates and delete them
//NameCollectFunctor namefunctor(mCurrentFullName);
NameCollectFunctor namefunctor(nameToCleanUp);
gInventory.collectDescendentsIf(catID, cats, items, FALSE, namefunctor);
gInventory.collectDescendentsIf(catID, cats, items, false, namefunctor);
for (const auto& item : items)
{
@ -1706,7 +1705,7 @@ void FSLSLBridge::detachOtherBridges()
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID);
//detach everything except current valid bridge - if any
gInventory.collectDescendents(catID, cats, items, FALSE);
gInventory.collectDescendents(catID, cats, items, false);
for (const auto& item : items)
{

8
indra/newview/fslslpreproc.cpp
View File

@ -75,7 +75,7 @@ std::optional<LLUUID> FSLSLPreprocessor::findInventoryByName(std::string_view na
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
ScriptMatches namematches(name);
gInventory.collectDescendentsIf(gInventory.getRootFolderID(), cats, items, FALSE, namematches);
gInventory.collectDescendentsIf(gInventory.getRootFolderID(), cats, items, false, namematches);
if (!items.empty())
{
@ -600,7 +600,7 @@ public:
item->getType(),
&FSLSLPreprocessor::FSProcCacheCallback,
info,
TRUE);
true);
return true;
}
}
@ -773,7 +773,7 @@ void FSLSLPreprocessor::FSProcCacheCallback(const LLUUID& iuuid, LLAssetType::ET
}
}
void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, bool defcache)
void FSLSLPreprocessor::preprocess_script(bool close, bool sync, bool defcache)
{
mClose = close;
mSync = sync;
@ -1568,7 +1568,7 @@ void FSLSLPreprocessor::start_process()
outfield->setText(LLStringExplicit(output));
}
mCore->mPostScript = output;
mCore->enableSave(TRUE); // The preprocessor run forces a change. (For FIRE-10173) -Sei
mCore->enableSave(true); // The preprocessor run forces a change. (For FIRE-10173) -Sei
mCore->doSaveComplete((void*)mCore, mClose, mSync);
}
}

8
indra/newview/fslslpreproc.h
View File

@ -45,11 +45,11 @@ class FSLSLPreprocessor
public:
FSLSLPreprocessor(LLScriptEdCore* corep)
: mCore(corep), mWaving(false), mClose(FALSE), mSync(false), mStandalone(false)
: mCore(corep), mWaving(false), mClose(false), mSync(false), mStandalone(false)
{}
FSLSLPreprocessor()
: mWaving(false), mClose(FALSE), mSync(false), mStandalone(true)
: mWaving(false), mClose(false), mSync(false), mStandalone(true)
{}
static bool mono_directive(std::string_view text, bool agent_inv = true);
@ -62,7 +62,7 @@ public:
static std::optional<LLUUID> findInventoryByName(std::string_view name);
static void FSProcCacheCallback(const LLUUID& uuid, LLAssetType::EType type,
void *userdata, S32 result, LLExtStat extstat);
void preprocess_script(BOOL close = FALSE, bool sync = false, bool defcache = false);
void preprocess_script(bool close = false, bool sync = false, bool defcache = false);
void preprocess_script(const LLUUID& asset_id, LLScriptQueueData* data, LLAssetType::EType type, const std::string& script_data);
void start_process();
void display_message(std::string_view msg);
@ -86,7 +86,7 @@ public:
LLScriptEdCore* mCore;
bool mWaving;
BOOL mClose;
bool mClose;
bool mSync;
std::string mMainScriptName;

2
indra/newview/fsnearbychatbarlistener.cpp
View File

@ -105,6 +105,6 @@ void FSNearbyChatBarListener::sendChat(LLSD const & chat_data) const
}
// Send it as if it was typed in
FSNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, ((BOOL)(channel == 0)) && gSavedSettings.getBOOL("PlayChatAnim"));
FSNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, (channel == 0) && gSavedSettings.getBOOL("PlayChatAnim"));
}

22
indra/newview/fsnearbychathub.cpp
View File

@ -298,12 +298,12 @@ void FSNearbyChat::sendChat(LLWString text, EChatType type)
gAgent.stopTyping();
}
void FSNearbyChat::sendChatFromViewer(const std::string& utf8text, EChatType type, BOOL animate)
void FSNearbyChat::sendChatFromViewer(const std::string& utf8text, EChatType type, bool animate)
{
sendChatFromViewer(utf8str_to_wstring(utf8text), type, animate);
}
void FSNearbyChat::sendChatFromViewer(const LLWString& wtext, EChatType type, BOOL animate)
void FSNearbyChat::sendChatFromViewer(const LLWString& wtext, EChatType type, bool animate)
{
// Look for "/20 foo" channel chats.
S32 channel = 0;
@ -322,7 +322,7 @@ void FSNearbyChat::registerChatBar(FSNearbyChatControl* chatBar)
}
// unhide the default nearby chat bar on request (pressing Enter or a letter key)
void FSNearbyChat::showDefaultChatBar(BOOL visible, const char* text) const
void FSNearbyChat::showDefaultChatBar(bool visible, const char* text) const
{
if (!mDefaultChatBar)
{
@ -360,7 +360,7 @@ void FSNearbyChat::showDefaultChatBar(BOOL visible, const char* text) const
}
// We want to know which nearby chat editor (if any) currently has focus
void FSNearbyChat::setFocusedInputEditor(FSNearbyChatControl* inputEditor, BOOL focus)
void FSNearbyChat::setFocusedInputEditor(FSNearbyChatControl* inputEditor, bool focus)
{
if (focus)
{
@ -376,7 +376,7 @@ void FSNearbyChat::setFocusedInputEditor(FSNearbyChatControl* inputEditor, BOOL
// for the "arrow key moves avatar when chat is empty" hack in llviewerwindow.cpp
// and the hide chat bar feature in mouselook in llagent.cpp
BOOL FSNearbyChat::defaultChatBarIsIdle() const
bool FSNearbyChat::defaultChatBarIsIdle() const
{
if (mFocusedInputEditor && mFocusedInputEditor->isDefault())
{
@ -384,18 +384,18 @@ BOOL FSNearbyChat::defaultChatBarIsIdle() const
}
// if any other chat bar has focus, report "idle", because they're not the default
return TRUE;
return true;
}
// for the "arrow key moves avatar when chat is empty" hack in llviewerwindow.cpp
BOOL FSNearbyChat::defaultChatBarHasFocus() const
bool FSNearbyChat::defaultChatBarHasFocus() const
{
if (mFocusedInputEditor && mFocusedInputEditor->isDefault())
{
return TRUE;
return true;
}
return FALSE;
return false;
}
void FSNearbyChat::onDefaultChatBarButtonClicked()
@ -407,7 +407,7 @@ void FSNearbyChat::onDefaultChatBarButtonClicked()
//////////////////////////////////////////////////////////////////////////////
// General chat handling methods
void FSNearbyChat::sendChatFromViewer(const LLWString& wtext, const LLWString& out_text, EChatType type, BOOL animate, S32 channel)
void FSNearbyChat::sendChatFromViewer(const LLWString& wtext, const LLWString& out_text, EChatType type, bool animate, S32 channel)
{
std::string utf8_out_text = wstring_to_utf8str(out_text);
std::string utf8_text = wstring_to_utf8str(wtext);
@ -627,7 +627,7 @@ void FSNearbyChat::handleChatBarKeystroke(LLUICtrl* source, S32 channel /* = 0 *
}
KEY key = gKeyboard->currentKey();
MASK mask = gKeyboard->currentMask(FALSE);
MASK mask = gKeyboard->currentMask(false);
// Ignore "special" keys, like backspace, arrows, etc.
if (length > 1

14
indra/newview/fsnearbychathub.h
View File

@ -50,19 +50,19 @@ public:
void registerChatBar(FSNearbyChatControl* chatBar);
// set the contents of the chat bar to "text" if it was empty, otherwise just show it
void showDefaultChatBar(BOOL visible, const char* text = NULL) const;
void showDefaultChatBar(bool visible, const char* text = NULL) const;
void sendChat(LLWString text, EChatType type);
static LLWString stripChannelNumber(const LLWString &mesg, S32* channel, S32* last_channel, bool* is_set);
static EChatType processChatTypeTriggers(EChatType type, std::string &str);
void sendChatFromViewer(const std::string& utf8text, EChatType type, BOOL animate);
void sendChatFromViewer(const LLWString& wtext, EChatType type, BOOL animate);
static void sendChatFromViewer(const LLWString& wtext, const LLWString& out_text, EChatType type, BOOL animate, S32 channel);
void sendChatFromViewer(const std::string& utf8text, EChatType type, bool animate);
void sendChatFromViewer(const LLWString& wtext, EChatType type, bool animate);
static void sendChatFromViewer(const LLWString& wtext, const LLWString& out_text, EChatType type, bool animate, S32 channel);
void setFocusedInputEditor(FSNearbyChatControl* inputEditor, BOOL focus);
void setFocusedInputEditor(FSNearbyChatControl* inputEditor, bool focus);
BOOL defaultChatBarIsIdle() const;
BOOL defaultChatBarHasFocus() const;
bool defaultChatBarIsIdle() const;
bool defaultChatBarHasFocus() const;
static void handleChatBarKeystroke(LLUICtrl* source, S32 channel = 0);

4
indra/newview/fsnearbychatvoicemonitor.cpp
View File

@ -66,12 +66,12 @@ void FSNearbyChatVoiceControl::draw()
if (mVoiceMonitorVisible)
{
setTextPadding(mOriginalTextpadLeft, mOriginalTextpadRight + mVoiceMonitor->getRect().getWidth() + mVoiceMonitorPadding);
mVoiceMonitor->setVisible(TRUE);
mVoiceMonitor->setVisible(true);
}
else
{
setTextPadding(mOriginalTextpadLeft, mOriginalTextpadRight);
mVoiceMonitor->setVisible(FALSE);
mVoiceMonitor->setVisible(false);
}
}
FSNearbyChatControl::draw();

16
indra/newview/fspanelblocklist.cpp
View File

@ -244,22 +244,22 @@ void FSPanelBlockList::onCustomAction(const LLSD& userdata)
}
else if ("sort_by_name" == command_name)
{
mBlockedList->sortByColumn("item_name", TRUE);
mBlockedList->sortByColumn("item_name", true);
gSavedSettings.setU32("BlockPeopleSortOrder", E_SORT_BY_NAME_ASC);
}
else if ("sort_by_type" == command_name)
{
mBlockedList->sortByColumn("item_type", TRUE);
mBlockedList->sortByColumn("item_type", true);
gSavedSettings.setU32("BlockPeopleSortOrder", E_SORT_BY_TYPE_ASC);
}
else if ("sort_by_name_desc" == command_name)
{
mBlockedList->sortByColumn("item_name", FALSE);
mBlockedList->sortByColumn("item_name", false);
gSavedSettings.setU32("BlockPeopleSortOrder", E_SORT_BY_NAME_DESC);
}
else if ("sort_by_type_desc" == command_name)
{
mBlockedList->sortByColumn("item_type", FALSE);
mBlockedList->sortByColumn("item_type", false);
gSavedSettings.setU32("BlockPeopleSortOrder", E_SORT_BY_TYPE_DESC);
}
else if ("unblock_item" == command_name)
@ -396,8 +396,8 @@ void FSPanelBlockList::toggleMute(U32 flags)
void FSPanelBlockList::blockResidentByName()
{
const BOOL allow_multiple = FALSE;
const BOOL close_on_select = TRUE;
const bool allow_multiple = false;
const bool close_on_select = true;
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSPanelBlockList::callbackBlockPicked, this, _1, _2), allow_multiple, close_on_select);
LLFloater* parent = dynamic_cast<LLFloater*>(getParent());
@ -446,7 +446,7 @@ void FSPanelBlockList::callbackBlockByName(const std::string& text)
if (text.empty()) return;
LLMute mute(LLUUID::null, text, LLMute::BY_NAME);
BOOL success = LLMuteList::getInstance()->add(mute);
bool success = LLMuteList::getInstance()->add(mute);
if (!success)
{
LLNotificationsUtil::add("MuteByNameFailed");
@ -479,7 +479,7 @@ void FSPanelBlockList::onFilterEdit(std::string search_string)
void FSPanelBlockList::onSortChanged()
{
BOOL ascending = mBlockedList->getSortAscending();
bool ascending = mBlockedList->getSortAscending();
std::string column = mBlockedList->getSortColumnName();
if (column == "item_name")

2
indra/newview/fspanelcontactsets.cpp
View File

@ -222,7 +222,7 @@ void FSPanelContactSets::onClickAddAvatar(LLUICtrl* ctrl)
{
LLFloater* root_floater = gFloaterView->getParentFloater(this);
LLFloater* avatar_picker = LLFloaterAvatarPicker::show(boost::bind(&FSPanelContactSets::handlePickerCallback, this, _1, mContactSetCombo->getValue().asString()),
TRUE, TRUE, TRUE, root_floater->getName(), ctrl);
true, true, true, root_floater->getName(), ctrl);
if (root_floater && avatar_picker)
{
root_floater->addDependentFloater(avatar_picker);

54
indra/newview/fspanellogin.cpp
View File

@ -81,8 +81,8 @@ const S32 MAX_PASSWORD_SL = 16;
const S32 MAX_PASSWORD_OPENSIM = 255;
FSPanelLogin *FSPanelLogin::sInstance = NULL;
BOOL FSPanelLogin::sCapslockDidNotification = FALSE;
BOOL FSPanelLogin::sCredentialSet = FALSE;
bool FSPanelLogin::sCapslockDidNotification = false;
bool FSPanelLogin::sCredentialSet = false;
std::string FSPanelLogin::sPassword = "";
std::string FSPanelLogin::sPendingNewGridURI{};
@ -187,10 +187,10 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
mInitialized(false),
mGridListChangedCallbackConnection()
{
setBackgroundVisible(FALSE);
setBackgroundOpaque(TRUE);
setBackgroundVisible(false);
setBackgroundOpaque(true);
mPasswordModified = FALSE;
mPasswordModified = false;
sInstance = this;
@ -233,7 +233,7 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
server_choice_combo->setToolTip(getString("ServerComboTooltip"));
#endif
#ifdef SINGLEGRID
server_choice_combo->setEnabled(FALSE);
server_choice_combo->setEnabled(false);
#endif
std::string current_grid = LLGridManager::getInstance()->getGrid();
@ -425,8 +425,8 @@ void FSPanelLogin::giveFocus()
std::string username = sInstance->getChild<LLUICtrl>("username_combo")->getValue().asString();
std::string pass = sInstance->getChild<LLUICtrl>("password_edit")->getValue().asString();
BOOL have_username = !username.empty();
BOOL have_pass = !pass.empty();
bool have_username = !username.empty();
bool have_pass = !pass.empty();
LLLineEditor* edit = NULL;
LLComboBox* combo = NULL;
@ -469,7 +469,7 @@ void FSPanelLogin::showLoginWidgets()
std::string splash_screen_url = LLGridManager::getInstance()->getLoginPage();
web_browser->navigateTo( splash_screen_url, HTTP_CONTENT_TEXT_HTML );
LLUICtrl* username_combo = sInstance->getChild<LLUICtrl>("username_combo");
username_combo->setFocus(TRUE);
username_combo->setFocus(true);
}
}
@ -486,7 +486,7 @@ void FSPanelLogin::show(const LLRect &rect,
if( !gFocusMgr.getKeyboardFocus() )
{
// Grab focus and move cursor to first enabled control
sInstance->setFocus(TRUE);
sInstance->setFocus(true);
}
// Make sure that focus always goes here (and use the latest sInstance that was just created)
@ -513,7 +513,7 @@ void FSPanelLogin::setFields(LLPointer<LLCredential> credential, bool from_start
}
if (sInstance->mInitialized)
{
sCredentialSet = TRUE;
sCredentialSet = true;
}
LL_INFOS("Credentials") << "Setting login fields to " << *credential << LL_ENDL;
@ -537,8 +537,8 @@ void FSPanelLogin::setFields(LLPointer<LLCredential> credential, bool from_start
if (!username_combo->selectByValue(cred_name))
{
username_combo->setTextEntry(login_id);
sInstance->mPasswordModified = TRUE;
sInstance->getChild<LLButton>("remove_user_btn")->setEnabled(FALSE);
sInstance->mPasswordModified = true;
sInstance->getChild<LLButton>("remove_user_btn")->setEnabled(false);
}
sInstance->mPreviousUsername = username_combo->getValue().asString();
sInstance->addFavoritesToStartLocation();
@ -578,7 +578,7 @@ void FSPanelLogin::setFields(LLPointer<LLCredential> credential, bool from_start
sInstance->getChild<LLLineEditor>("password_edit")->setText(sPassword);
sInstance->mPasswordLength = sPassword.length();
sInstance->updateLoginButtons();
sInstance->mPasswordModified = TRUE;
sInstance->mPasswordModified = true;
}
}
}
@ -705,7 +705,7 @@ void FSPanelLogin::getFields(LLPointer<LLCredential>& credential,
// static
BOOL FSPanelLogin::areCredentialFieldsDirty()
bool FSPanelLogin::areCredentialFieldsDirty()
{
if (!sInstance)
{
@ -733,10 +733,10 @@ void FSPanelLogin::updateLocationSelectorsVisibility()
{
if (sInstance)
{
BOOL show_start = gSavedSettings.getBOOL("ShowStartLocation");
bool show_start = gSavedSettings.getBOOL("ShowStartLocation");
sInstance->getChild<LLLayoutPanel>("start_location_panel")->setVisible(show_start);
BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
bool show_server = gSavedSettings.getBOOL("ForceShowGrid");
sInstance->getChild<LLLayoutPanel>("grid_panel")->setVisible(show_server);
sInstance->addUsersToCombo(show_server);
}
@ -940,7 +940,7 @@ void FSPanelLogin::onClickConnect(void *)
if (sInstance && sInstance->mCallback)
{
// JC - Make sure the fields all get committed.
sInstance->setFocus(FALSE);
sInstance->setFocus(false);
LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
LLSD combo_val = combo->getSelectedValue();
@ -976,7 +976,7 @@ void FSPanelLogin::onClickConnect(void *)
}
else
{
sCredentialSet = FALSE;
sCredentialSet = false;
LLPointer<LLCredential> cred;
bool remember;
getFields(cred, remember);
@ -1066,11 +1066,11 @@ void FSPanelLogin::onClickHelp(void*)
void FSPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
{
FSPanelLogin *self = (FSPanelLogin *)user_data;
self->mPasswordModified = TRUE;
if (gKeyboard->getKeyDown(KEY_CAPSLOCK) && sCapslockDidNotification == FALSE)
self->mPasswordModified = true;
if (gKeyboard->getKeyDown(KEY_CAPSLOCK) && sCapslockDidNotification == false)
{
// *TODO: use another way to notify user about enabled caps lock, see EXT-6858
sCapslockDidNotification = TRUE;
sCapslockDidNotification = true;
}
LLLineEditor* password_edit(self->getChild<LLLineEditor>("password_edit"));
@ -1229,7 +1229,7 @@ std::string canonicalize_username(const std::string& name)
return first + ' ' + last;
}
void FSPanelLogin::addUsersToCombo(BOOL show_server)
void FSPanelLogin::addUsersToCombo(bool show_server)
{
LLComboBox* combo = getChild<LLComboBox>("username_combo");
if (!combo) return;
@ -1385,7 +1385,7 @@ void FSPanelLogin::onSelectUser()
sInstance->mPreviousUsername = combo->getValue().asString();
sInstance->mUsernameLength = combo->getValue().asString().length();
sInstance->updateLoginButtons();
sInstance->getChild<LLButton>("remove_user_btn")->setEnabled(FALSE);
sInstance->getChild<LLButton>("remove_user_btn")->setEnabled(false);
return;
}
@ -1394,8 +1394,8 @@ void FSPanelLogin::onSelectUser()
LLPointer<LLCredential> credential = gSecAPIHandler->loadCredential(cred_name);
sInstance->setFields(credential);
sInstance->mPasswordModified = FALSE;
sInstance->getChild<LLButton>("remove_user_btn")->setEnabled(TRUE);
sInstance->mPasswordModified = false;
sInstance->getChild<LLButton>("remove_user_btn")->setEnabled(true);
size_t arobase = cred_name.find("@");
if (arobase != std::string::npos && arobase + 1 < cred_name.length())
@ -1523,7 +1523,7 @@ void FSPanelLogin::onModeChange(const LLSD& original_value, const LLSD& new_valu
if (gSavedSettings.getBOOL("FSToolbarsResetOnModeChange"))
{
LL_INFOS() << "Clearing toolbar settings." << LL_ENDL;
gSavedSettings.setBOOL("ResetToolbarSettings", TRUE);
gSavedSettings.setBOOL("ResetToolbarSettings", true);
}
if (original_value.asString() != new_value.asString())

12
indra/newview/fspanellogin.h
View File

@ -59,9 +59,9 @@ public:
static void getFields(LLPointer<LLCredential>& credential, bool& remember);
static BOOL isCredentialSet() { return sCredentialSet; }
static bool isCredentialSet() { return sCredentialSet; }
static BOOL areCredentialFieldsDirty();
static bool areCredentialFieldsDirty();
static void setLocation(const LLSLURL& slurl);
static void autologinToLocation(const LLSLURL& slurl);
@ -91,7 +91,7 @@ public:
void gridListChanged(bool success);
private:
void addFavoritesToStartLocation();
void addUsersToCombo(BOOL show_server);
void addUsersToCombo(bool show_server);
void onSelectUser();
void onModeChange(const LLSD& original_value, const LLSD& new_value);
void onModeChangeConfirm(const LLSD& original_value, const LLSD& new_value, const LLSD& notification, const LLSD& response);
@ -119,13 +119,13 @@ private:
void (*mCallback)(S32 option, void *userdata);
void* mCallbackData;
BOOL mPasswordModified;
bool mPasswordModified;
bool mShowFavorites;
static FSPanelLogin* sInstance;
static BOOL sCapslockDidNotification;
static bool sCapslockDidNotification;
static BOOL sCredentialSet;
static bool sCredentialSet;
unsigned int mUsernameLength;
unsigned int mPasswordLength;

4
indra/newview/fspanelradar.cpp
View File

@ -484,7 +484,7 @@ void FSPanelRadar::onColumnDisplayModeChanged()
parent_floater->getResizeLimits(&min_width, &min_height);
std::string current_sort_col = mRadarList->getSortColumnName();
BOOL current_sort_asc = mRadarList->getSortAscending();
bool current_sort_asc = mRadarList->getSortAscending();
mRadarList->clearRows();
mRadarList->clearColumns();
@ -529,7 +529,7 @@ void FSPanelRadar::onColumnDisplayModeChanged()
(current_sort_col == "seen_sort" && mRadarList->getColumn("seen")->getWidth() == -1))
{
current_sort_col = "range";
current_sort_asc = TRUE;
current_sort_asc = true;
}
mRadarList->sortByColumn(current_sort_col, current_sort_asc);
mRadarList->setFilterColumn(0);

10
indra/newview/fsparticipantlist.cpp
View File

@ -174,7 +174,7 @@ FSParticipantList::~FSParticipantList()
mAvatarList->setComparator(NULL);
}
void FSParticipantList::setSpeakingIndicatorsVisible(BOOL visible)
void FSParticipantList::setSpeakingIndicatorsVisible(bool visible)
{
mAvatarList->setSpeakingIndicatorsVisible(visible);
};
@ -263,10 +263,10 @@ void FSParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param)
// update voice mute state of all items. See EXT-7235
LLSpeakerMgr::speaker_list_t speaker_list;
// Use also participants which are not in voice session now (the second arg is TRUE).
// Use also participants which are not in voice session now (the second arg is true).
// They can already have mModeratorMutedVoice set from the previous voice session
// and LLSpeakerVoiceModerationEvent will not be sent when speaker manager is updated next time.
mSpeakerMgr->getSpeakerList(&speaker_list, TRUE);
mSpeakerMgr->getSpeakerList(&speaker_list, true);
for(LLSpeakerMgr::speaker_list_t::iterator it = speaker_list.begin(); it != speaker_list.end(); it++)
{
const LLPointer<LLSpeaker>& speakerp = *it;
@ -555,7 +555,7 @@ void FSParticipantList::FSParticipantListMenu::show(LLView* spawning_view, const
LLListContextMenu::show(spawning_view, uuids, x, y);
const LLUUID& speaker_id = mUUIDs.front();
BOOL is_muted = isMuted(speaker_id);
bool is_muted = isMuted(speaker_id);
if (is_muted)
{
@ -593,7 +593,7 @@ void FSParticipantList::FSParticipantListMenu::allowTextChat(const LLSD& userdat
void FSParticipantList::FSParticipantListMenu::toggleMute(const LLSD& userdata, U32 flags)
{
const LLUUID speaker_id = mUUIDs.front();
BOOL is_muted = LLMuteList::getInstance()->isMuted(speaker_id, flags);
bool is_muted = LLMuteList::getInstance()->isMuted(speaker_id, flags);
std::string name;
//fill in name using voice client's copy of name cache

2
indra/newview/fsparticipantlist.h
View File

@ -60,7 +60,7 @@ public:
bool exclude_agent = true,
bool can_toggle_icons = true);
~FSParticipantList();
void setSpeakingIndicatorsVisible(BOOL visible);
void setSpeakingIndicatorsVisible(bool visible);
enum EParticipantSortOrder
{

8
indra/newview/fsradar.cpp
View File

@ -142,7 +142,7 @@ void FSRadar::radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name,
args["MESSAGE"] = static_cast<std::string>(postMsg);
LLNotificationsUtil::add("RadarAlert",
args,
payload.with("respond_on_mousedown", TRUE),
payload.with("respond_on_mousedown", true),
boost::bind(&LLAvatarActions::zoomIn, agent_id));
}
else
@ -266,7 +266,7 @@ void FSRadar::updateRadarList()
mEntryList.emplace(avid, std::make_shared<FSRadarEntry>(avid));
}
speakermgr->update(TRUE);
speakermgr->update(true);
//STEP 2: Transform detected model list data into more flexible multimap data structure;
//TS: Count avatars in chat range and in the same region
@ -934,11 +934,11 @@ void FSRadar::onRadarReportToClicked(const LLSD& userdata)
const std::string chosen_item = userdata.asString();
if (chosen_item == "radar_toasts")
{
gSavedSettings.setBOOL("FSMilkshakeRadarToasts", TRUE);
gSavedSettings.setBOOL("FSMilkshakeRadarToasts", true);
}
else if (chosen_item == "radar_nearby_chat")
{
gSavedSettings.setBOOL("FSMilkshakeRadarToasts", FALSE);
gSavedSettings.setBOOL("FSMilkshakeRadarToasts", false);
}
}

2
indra/newview/fsscrolllistctrl.cpp
View File

@ -177,7 +177,7 @@ bool FSScrollListCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
return mHandleDaDCallback(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
return FALSE;
return false;
}

2
indra/newview/fsscrolllistctrl.h
View File

@ -80,7 +80,7 @@ public:
void refreshLineHeight();
typedef boost::function<BOOL(S32, S32, MASK, BOOL, EDragAndDropType, void*, EAcceptance*, std::string&)> handle_dad_callback_signal_t;
typedef boost::function<bool(S32, S32, MASK, bool, EDragAndDropType, void*, EAcceptance*, std::string&)> handle_dad_callback_signal_t;
void setHandleDaDCallback(const handle_dad_callback_signal_t& func)
{
mHandleDaDCallback = func;

2
indra/newview/fsslurlcommand.cpp
View File

@ -54,7 +54,7 @@ public:
}
LLUUID target_id;
if (!target_id.set(params[0], FALSE))
if (!target_id.set(params[0], false))
{
return false;
}

2
indra/newview/lggbeamcolormapfloater.cpp
View File

@ -76,7 +76,7 @@ void lggBeamColorMapFloater::draw()
//set the color of the preview thing
LLColor4 bColor = LLColor4(lggBeamMaps::beamColorFromData(mData));
mBeamColorPreview->set(bColor, TRUE);
mBeamColorPreview->set(bColor, true);
static LLCachedControl<F32> max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f);
drawConeToOwner(mContextConeOpacity, max_opacity, mFSPanel->getChild<LLButton>("BeamColor_new"), mContextConeFadeTime, mContextConeInAlpha, mContextConeOutAlpha);

354
indra/newview/llagent.cpp
View File

File diff suppressed because it is too large Load Diff

166
indra/newview/llagent.h
View File

@ -82,7 +82,7 @@ struct LLGroupData
LLUUID mInsigniaID;
U64 mPowers;
bool mAcceptNotices;
BOOL mListInProfile;
bool mListInProfile;
S32 mContribution;
std::string mName;
};
@ -121,7 +121,7 @@ private:
public:
void onAppFocusGained();
void setFirstLogin(bool b);
// Return TRUE if the database reported this login as the first for this particular user.
// Return true if the database reported this login as the first for this particular user.
bool isFirstLogin() const { return mFirstLogin; }
bool isInitialized() const { return mInitialized; }
@ -173,10 +173,10 @@ public:
// On the very first login, outfit needs to be chosen by some
// mechanism, usually by loading the requested initial outfit. We
// don't render the avatar until the choice is made.
BOOL isOutfitChosen() const { return mOutfitChosen; }
void setOutfitChosen(BOOL b) { mOutfitChosen = b; }
bool isOutfitChosen() const { return mOutfitChosen; }
void setOutfitChosen(bool b) { mOutfitChosen = b; }
private:
BOOL mOutfitChosen;
bool mOutfitChosen;
/** Identity
** **
@ -242,13 +242,13 @@ private:
public:
void setStartPosition(U32 location_id); // Marks current location as start, sends information to servers
void setHomePosRegion(const U64& region_handle, const LLVector3& pos_region);
BOOL getHomePosGlobal(LLVector3d* pos_global);
bool getHomePosGlobal(LLVector3d* pos_global);
bool isInHomeRegion();
private:
void setStartPositionSuccess(const LLSD &result);
BOOL mHaveHomePosition;
bool mHaveHomePosition;
U64 mHomeRegionHandle;
LLVector3 mHomePosRegion;
@ -275,7 +275,7 @@ public:
void setRegion(LLViewerRegion *regionp);
LLViewerRegion *getRegion() const;
LLHost getRegionHost() const;
BOOL inPrelude();
bool inPrelude();
// Capability
std::string getRegionCapability(const std::string &name); // short hand for if (getRegion()) { getRegion()->getCapability(name) }
@ -374,8 +374,8 @@ private:
// Fly
//--------------------------------------------------------------------
public:
BOOL getFlying() const;
void setFlying(BOOL fly, BOOL fail_sound = FALSE);
bool getFlying() const;
void setFlying(bool fly, bool fail_sound = false);
static void toggleFlying();
static bool enableFlying();
bool canFly(); // Does this parcel allow you to fly?
@ -431,7 +431,7 @@ private:
public:
void setAFK();
void clearAFK();
BOOL getAFK() const;
bool getAFK() const;
static const F32 MIN_AFK_TIME;
//--------------------------------------------------------------------
@ -504,59 +504,59 @@ private:
public:
void setAutorespond();
void clearAutorespond();
void selectAutorespond(BOOL);
BOOL getAutorespond() const;
void selectAutorespond(bool);
bool getAutorespond() const;
private:
BOOL mIsAutorespond;
bool mIsAutorespond;
public:
void setAutorespondNonFriends();
void clearAutorespondNonFriends();
void selectAutorespondNonFriends(BOOL);
BOOL getAutorespondNonFriends() const;
void selectAutorespondNonFriends(bool);
bool getAutorespondNonFriends() const;
private:
BOOL mIsAutorespondNonFriends;
bool mIsAutorespondNonFriends;
// <FS:PP> FIRE-1245: Option to block/reject teleport offers
public:
void setRejectTeleportOffers();
void clearRejectTeleportOffers();
void selectRejectTeleportOffers(BOOL);
BOOL getRejectTeleportOffers() const;
void selectRejectTeleportOffers(bool);
bool getRejectTeleportOffers() const;
private:
BOOL mIsRejectTeleportOffers;
bool mIsRejectTeleportOffers;
// </FS:PP> FIRE-1245: Option to block/reject teleport offers
// <FS:PP> FIRE-15233: Automatic friendship request refusal
public:
void setRejectFriendshipRequests();
void clearRejectFriendshipRequests();
void selectRejectFriendshipRequests(BOOL);
BOOL getRejectFriendshipRequests() const;
void selectRejectFriendshipRequests(bool);
bool getRejectFriendshipRequests() const;
private:
BOOL mIsRejectFriendshipRequests;
bool mIsRejectFriendshipRequests;
// </FS:PP> FIRE-15233: Automatic friendship request refusal
// <FS:PP> Option to block/reject all group invites
public:
void setRejectAllGroupInvites();
void clearRejectAllGroupInvites();
void selectRejectAllGroupInvites(BOOL);
BOOL getRejectAllGroupInvites() const;
void selectRejectAllGroupInvites(bool);
bool getRejectAllGroupInvites() const;
private:
BOOL mIsRejectAllGroupInvites;
bool mIsRejectAllGroupInvites;
// </FS:PP> Option to block/reject all group invites
//--------------------------------------------------------------------
// Grab
//--------------------------------------------------------------------
public:
BOOL leftButtonGrabbed() const;
BOOL rotateGrabbed() const;
BOOL forwardGrabbed() const;
BOOL backwardGrabbed() const;
BOOL upGrabbed() const;
BOOL downGrabbed() const;
bool leftButtonGrabbed() const;
bool rotateGrabbed() const;
bool forwardGrabbed() const;
bool backwardGrabbed() const;
bool upGrabbed() const;
bool downGrabbed() const;
//--------------------------------------------------------------------
// Controls
@ -565,26 +565,26 @@ public:
U32 getControlFlags();
void setControlFlags(U32 mask); // Performs bitwise mControlFlags |= mask
void clearControlFlags(U32 mask); // Performs bitwise mControlFlags &= ~mask
BOOL controlFlagsDirty() const;
bool controlFlagsDirty() const;
void enableControlFlagReset();
void resetControlFlags();
BOOL anyControlGrabbed() const; // True iff a script has taken over a control
BOOL isControlGrabbed(S32 control_index) const;
bool anyControlGrabbed() const; // True iff a script has taken over a control
bool isControlGrabbed(S32 control_index) const;
// Send message to simulator to force grabbed controls to be
// released, in case of a poorly written script.
void forceReleaseControls();
void setFlagsDirty() { mbFlagsDirty = TRUE; }
void setFlagsDirty() { mbFlagsDirty = true; }
private:
S32 mControlsTakenCount[TOTAL_CONTROLS];
S32 mControlsTakenPassedOnCount[TOTAL_CONTROLS];
U32 mControlFlags; // Replacement for the mFooKey's
BOOL mbFlagsDirty;
BOOL mbFlagsNeedReset; // ! HACK ! For preventing incorrect flags sent when crossing region boundaries
bool mbFlagsDirty;
bool mbFlagsNeedReset; // ! HACK ! For preventing incorrect flags sent when crossing region boundaries
// <FS> Ignore prejump and always fly
BOOL mIgnorePrejump;
BOOL mAlwaysFly;
bool mIgnorePrejump;
bool mAlwaysFly;
void updateIgnorePrejump(const LLSD &data);
void updateFSAlwaysFly(const LLSD &data);
// </FS> Ignore prejump and always fly
@ -606,8 +606,8 @@ public:
void endAnimationUpdateUI();
void unpauseAnimation() { mPauseRequest = NULL; }
BOOL getCustomAnim() const { return mCustomAnim; }
void setCustomAnim(BOOL anim) { mCustomAnim = anim; }
bool getCustomAnim() const { return mCustomAnim; }
void setCustomAnim(bool anim) { mCustomAnim = anim; }
typedef boost::signals2::signal<void ()> camera_signal_t;
boost::signals2::connection setMouselookModeInCallback( const camera_signal_t::slot_type& cb );
@ -616,9 +616,9 @@ public:
private:
camera_signal_t* mMouselookModeInSignal;
camera_signal_t* mMouselookModeOutSignal;
BOOL mCustomAnim; // Current animation is ANIM_AGENT_CUSTOMIZE ?
bool mCustomAnim; // Current animation is ANIM_AGENT_CUSTOMIZE ?
LLPointer<LLPauseRequestHandle> mPauseRequest;
BOOL mViewsPushed; // Keep track of whether or not we have pushed views
bool mViewsPushed; // Keep track of whether or not we have pushed views
/** Animation
** **
@ -644,8 +644,8 @@ public:
void moveYaw(F32 mag, bool reset_view = true);
void movePitch(F32 mag);
BOOL isMovementLocked() const { return mMovementKeysLocked; }
void setMovementLocked(BOOL set_locked) { mMovementKeysLocked = set_locked; }
bool isMovementLocked() const { return mMovementKeysLocked; }
void setMovementLocked(bool set_locked) { mMovementKeysLocked = set_locked; }
//--------------------------------------------------------------------
// Move the avatar's frame
@ -664,12 +664,12 @@ public:
// Autopilot
//--------------------------------------------------------------------
public:
BOOL getAutoPilot() const { return mAutoPilot; }
bool getAutoPilot() const { return mAutoPilot; }
LLVector3d getAutoPilotTargetGlobal() const { return mAutoPilotTargetGlobal; }
LLUUID getAutoPilotLeaderID() const { return mLeaderID; }
F32 getAutoPilotStopDistance() const { return mAutoPilotStopDistance; }
F32 getAutoPilotTargetDist() const { return mAutoPilotTargetDist; }
BOOL getAutoPilotUseRotation() const { return mAutoPilotUseRotation; }
bool getAutoPilotUseRotation() const { return mAutoPilotUseRotation; }
LLVector3 getAutoPilotTargetFacing() const { return mAutoPilotTargetFacing; }
F32 getAutoPilotRotationThreshold() const { return mAutoPilotRotationThreshold; }
std::string getAutoPilotBehaviorName() const { return mAutoPilotBehaviorName; }
@ -677,30 +677,30 @@ public:
void startAutoPilotGlobal(const LLVector3d &pos_global,
const std::string& behavior_name = std::string(),
const LLQuaternion *target_rotation = NULL,
void (*finish_callback)(BOOL, void *) = NULL, void *callback_data = NULL,
void (*finish_callback)(bool, void *) = NULL, void *callback_data = NULL,
F32 stop_distance = 0.f, F32 rotation_threshold = 0.03f,
BOOL allow_flying = TRUE);
void startFollowPilot(const LLUUID &leader_id, BOOL allow_flying = TRUE, F32 stop_distance = 0.5f);
void stopAutoPilot(BOOL user_cancel = FALSE);
bool allow_flying = true);
void startFollowPilot(const LLUUID &leader_id, bool allow_flying = true, F32 stop_distance = 0.5f);
void stopAutoPilot(bool user_cancel = false);
void setAutoPilotTargetGlobal(const LLVector3d &target_global);
void autoPilot(F32 *delta_yaw); // Autopilot walking action, angles in radians
void renderAutoPilotTarget();
private:
BOOL mAutoPilot;
BOOL mAutoPilotFlyOnStop;
BOOL mAutoPilotAllowFlying;
bool mAutoPilot;
bool mAutoPilotFlyOnStop;
bool mAutoPilotAllowFlying;
LLVector3d mAutoPilotTargetGlobal;
F32 mAutoPilotStopDistance;
BOOL mAutoPilotUseRotation;
bool mAutoPilotUseRotation;
LLVector3 mAutoPilotTargetFacing;
F32 mAutoPilotTargetDist;
S32 mAutoPilotNoProgressFrameCount;
F32 mAutoPilotRotationThreshold;
std::string mAutoPilotBehaviorName;
void (*mAutoPilotFinishedCallback)(BOOL, void *);
void (*mAutoPilotFinishedCallback)(bool, void *);
void* mAutoPilotCallbackData;
LLUUID mLeaderID;
BOOL mMovementKeysLocked;
bool mMovementKeysLocked;
/** Movement
** **
@ -744,7 +744,7 @@ private:
public:
void teleportViaLandmark(const LLUUID& landmark_id); // Teleport to a landmark
void teleportHome() { teleportViaLandmark(LLUUID::null); } // Go home
void teleportViaLure(const LLUUID& lure_id, BOOL godlike); // To an invited location
void teleportViaLure(const LLUUID& lure_id, bool godlike); // To an invited location
void teleportViaLocation(const LLVector3d& pos_global); // To a global location - this will probably need to be deprecated
// [RLVa:KB] - Checked: RLVa-2.0.0
void teleportViaLocationLookAt(const LLVector3d& pos_global, const LLVector3& look_at = LLVector3::zero);// To a global location, preserving camera rotation
@ -803,7 +803,7 @@ private:
// const LLVector3& pos_local, // Go to a named location home
// bool look_at_from_camera = false);
void doTeleportViaLandmark(const LLUUID& landmark_id); // Teleport to a landmark
void doTeleportViaLure(const LLUUID& lure_id, BOOL godlike); // To an invited location
void doTeleportViaLure(const LLUUID& lure_id, bool godlike); // To an invited location
void doTeleportViaLocation(const LLVector3d& pos_global); // To a global location - this will probably need to be deprecated
// [RLVa:KB] - Checked: RLVa-2.0.0
void doTeleportViaLocationLookAt(const LLVector3d& pos_global, const LLVector3& look_at);// To a global location, preserving camera rotation
@ -854,14 +854,14 @@ private:
public:
// Checks if agent can modify an object based on the permissions and the agent's proxy status.
BOOL isGrantedProxy(const LLPermissions& perm);
BOOL allowOperation(PermissionBit op,
bool isGrantedProxy(const LLPermissions& perm);
bool allowOperation(PermissionBit op,
const LLPermissions& perm,
U64 group_proxy_power = 0,
U8 god_minimum = GOD_MAINTENANCE);
const LLAgentAccess& getAgentAccess();
BOOL canManageEstate() const;
BOOL getAdminOverride() const;
bool canManageEstate() const;
bool getAdminOverride() const;
private:
LLAgentAccess * mAgentAccess;
@ -872,7 +872,7 @@ public:
bool isGodlike() const;
bool isGodlikeWithoutAdminMenuFakery() const;
U8 getGodLevel() const;
void setAdminOverride(BOOL b);
void setAdminOverride(bool b);
void setGodLevel(U8 god_level);
void requestEnterGodMode();
void requestLeaveGodMode();
@ -943,13 +943,13 @@ private:
public:
LLQuaternion getHeadRotation();
BOOL needsRenderAvatar(); // TRUE when camera mode is such that your own avatar should draw
BOOL needsRenderHead();
void setShowAvatar(BOOL show) { mShowAvatar = show; }
BOOL getShowAvatar() const { return mShowAvatar; }
bool needsRenderAvatar(); // true when camera mode is such that your own avatar should draw
bool needsRenderHead();
void setShowAvatar(bool show) { mShowAvatar = show; }
bool getShowAvatar() const { return mShowAvatar; }
private:
BOOL mShowAvatar; // Should we render the avatar?
bool mShowAvatar; // Should we render the avatar?
// <FS:Ansariel> [Legacy Bake]
U32 mAppearanceSerialNum;
@ -983,15 +983,15 @@ private:
public:
const LLUUID &getGroupID() const { return mGroupID; }
// Get group information by group_id, or FALSE if not in group.
BOOL getGroupData(const LLUUID& group_id, LLGroupData& data) const;
// Get group information by group_id, or false if not in group.
bool getGroupData(const LLUUID& group_id, LLGroupData& data) const;
// Get just the agent's contribution to the given group.
S32 getGroupContribution(const LLUUID& group_id) const;
// Update internal datastructures and update the server.
BOOL setGroupContribution(const LLUUID& group_id, S32 contribution);
BOOL setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOOL list_in_profile);
bool setGroupContribution(const LLUUID& group_id, S32 contribution);
bool setUserGroupFlags(const LLUUID& group_id, bool accept_notices, bool list_in_profile);
const std::string &getGroupName() const { return mGroupName; }
BOOL canJoinGroups() const;
bool canJoinGroups() const;
private:
std::string mGroupName;
LLUUID mGroupID;
@ -1001,10 +1001,10 @@ private:
//--------------------------------------------------------------------
public:
// Checks against all groups in the entire agent group list.
BOOL isInGroup(const LLUUID& group_id, BOOL ingnore_God_mod = FALSE) const;
bool isInGroup(const LLUUID& group_id, bool ingnore_God_mod = false) const;
protected:
// Only used for building titles.
BOOL isGroupMember() const { return !mGroupID.isNull(); }
bool isGroupMember() const { return !mGroupID.isNull(); }
public:
std::vector<LLGroupData> mGroups;
@ -1012,18 +1012,18 @@ public:
// Group Title
//--------------------------------------------------------------------
public:
void setHideGroupTitle(BOOL hide) { mHideGroupTitle = hide; }
BOOL isGroupTitleHidden() const { return mHideGroupTitle; }
void setHideGroupTitle(bool hide) { mHideGroupTitle = hide; }
bool isGroupTitleHidden() const { return mHideGroupTitle; }
private:
std::string mGroupTitle; // Honorific, like "Sir"
BOOL mHideGroupTitle;
bool mHideGroupTitle;
//--------------------------------------------------------------------
// Group Powers
//--------------------------------------------------------------------
public:
BOOL hasPowerInGroup(const LLUUID& group_id, U64 power) const;
BOOL hasPowerInActiveGroup(const U64 power) const;
bool hasPowerInGroup(const LLUUID& group_id, U64 power) const;
bool hasPowerInActiveGroup(const U64 power) const;
U64 getPowerInGroup(const LLUUID& group_id) const;
U64 mGroupPowers;
@ -1131,7 +1131,7 @@ public:
void togglePhantom();
bool getPhantom() const;
private:
BOOL mPhantom;
bool mPhantom;
/** Firestorm
** **

146
indra/newview/llagentcamera.cpp
View File

@ -130,14 +130,14 @@ LLAgentCamera::LLAgentCamera() :
mHUDTargetZoom(1.f),
mHUDCurZoom(1.f),
mForceMouselook(FALSE),
mForceMouselook(false),
mCameraMode( CAMERA_MODE_THIRD_PERSON ),
mLastCameraMode( CAMERA_MODE_THIRD_PERSON ),
mCameraPreset(CAMERA_PRESET_REAR_VIEW),
mCameraAnimating( FALSE ),
mCameraAnimating( false ),
mAnimationCameraStartGlobal(),
mAnimationFocusStartGlobal(),
mAnimationTimer(),
@ -153,15 +153,15 @@ LLAgentCamera::LLAgentCamera() :
mTargetCameraDistance(2.f),
mCameraZoomFraction(1.f), // deprecated
mThirdPersonHeadOffset(0.f, 0.f, 1.f),
mSitCameraEnabled(FALSE),
mSitCameraEnabled(false),
mCameraSmoothingLastPositionGlobal(),
mCameraSmoothingLastPositionAgent(),
mCameraSmoothingStop(false),
mCameraUpVector(LLVector3::z_axis), // default is straight up
mFocusOnAvatar(TRUE),
mAllowChangeToFollow(FALSE),
mFocusOnAvatar(true),
mAllowChangeToFollow(false),
mFocusGlobal(),
mFocusTargetGlobal(),
mFocusObject(NULL),
@ -301,8 +301,8 @@ LLAgentCamera::~LLAgentCamera()
// resetView()
//-----------------------------------------------------------------------------
// <FS:CR> FIRE-8798: Option to prevent camera reset on movement
//void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera)
void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera, BOOL movement)
//void LLAgentCamera::resetView(bool reset_camera, bool change_camera)
void LLAgentCamera::resetView(bool reset_camera, bool change_camera, bool movement)
// </FS:CR>
{
if (gDisconnected)
@ -312,7 +312,7 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera, BOOL moveme
if (gAgent.getAutoPilot())
{
gAgent.stopAutoPilot(TRUE);
gAgent.stopAutoPilot(true);
}
LLSelectMgr::getInstance()->unhighlightAll();
@ -335,7 +335,7 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera, BOOL moveme
// <FS:CR> FIRE-8798: Option to prevent camera reset on movement
static LLCachedControl<bool> sResetCameraOnMovement(gSavedSettings, "FSResetCameraOnMovement");
if (sResetCameraOnMovement || movement == FALSE)
if (sResetCameraOnMovement || movement == false)
{
// </FS:CR>
@ -378,7 +378,7 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera, BOOL moveme
gAgent.resetAxes(lerp(gAgent.getAtAxis(), agent_at_axis, LLSmoothInterpolation::getInterpolant(0.3f)));
}
setFocusOnAvatar(TRUE, ANIMATE);
setFocusOnAvatar(true, ANIMATE);
mCameraFOVZoomFactor = 0.f;
}
@ -414,7 +414,7 @@ void LLAgentCamera::unlockView()
{
setFocusGlobal(LLVector3d::zero, gAgentAvatarp->mID);
}
setFocusOnAvatar(FALSE, FALSE); // no animation
setFocusOnAvatar(false, false); // no animation
}
}
@ -605,16 +605,16 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi
//-----------------------------------------------------------------------------
// calcCameraMinDistance()
//-----------------------------------------------------------------------------
BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
bool LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
{
BOOL soft_limit = FALSE; // is the bounding box to be treated literally (volumes) or as an approximation (avatars)
bool soft_limit = false; // is the bounding box to be treated literally (volumes) or as an approximation (avatars)
if (!mFocusObject || mFocusObject->isDead() ||
mFocusObject->isMesh() ||
isDisableCameraConstraints())
{
obj_min_distance = 0.f;
return TRUE;
return true;
}
if (mFocusObject->mDrawable.isNull())
@ -626,7 +626,7 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
LL_ERRS() << "Focus object with no drawable!" << LL_ENDL;
#endif
obj_min_distance = 0.f;
return TRUE;
return true;
}
LLQuaternion inv_object_rot = ~mFocusObject->getRenderRotation();
@ -645,20 +645,20 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
object_extents.mV[VX] *= AVATAR_ZOOM_MIN_X_FACTOR;
object_extents.mV[VY] *= AVATAR_ZOOM_MIN_Y_FACTOR;
object_extents.mV[VZ] *= AVATAR_ZOOM_MIN_Z_FACTOR;
soft_limit = TRUE;
soft_limit = true;
}
LLVector3 abs_target_offset = target_offset_origin;
abs_target_offset.abs();
LLVector3 target_offset_dir = target_offset_origin;
BOOL target_outside_object_extents = FALSE;
bool target_outside_object_extents = false;
for (U32 i = VX; i <= VZ; i++)
{
if (abs_target_offset.mV[i] * 2.f > object_extents.mV[i] + OBJECT_EXTENTS_PADDING)
{
target_outside_object_extents = TRUE;
target_outside_object_extents = true;
}
if (camera_offset_target.mV[i] > 0.f)
{
@ -755,11 +755,11 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
{
if (camera_offset_clip > 0.f && target_offset_clip > 0.f)
{
return FALSE;
return false;
}
else if (camera_offset_clip < 0.f && target_offset_clip < 0.f)
{
return FALSE;
return false;
}
}
@ -768,7 +768,7 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
obj_min_distance += LLViewerCamera::getInstance()->getNear() + (soft_limit ? 0.1f : 0.2f);
return TRUE;
return true;
}
F32 LLAgentCamera::getCameraZoomFraction(bool get_third_person)
@ -1040,7 +1040,7 @@ void LLAgentCamera::cameraOrbitIn(const F32 meters)
if (!gSavedSettings.getBOOL("FreezeTime") && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f)
{
// No need to animate, camera is already there.
changeCameraToMouselook(FALSE);
changeCameraToMouselook(false);
}
if (!isDisableCameraConstraints())
@ -1248,7 +1248,7 @@ void LLAgentCamera::updateLookAt(const S32 mouse_x, const S32 mouse_y)
static LLTrace::BlockTimerStatHandle FTM_UPDATE_CAMERA("Camera");
extern BOOL gCubeSnapshot;
extern bool gCubeSnapshot;
//-----------------------------------------------------------------------------
// updateCamera()
@ -1269,7 +1269,7 @@ void LLAgentCamera::updateCamera()
// Set focus back on our avie if something changed it
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SETCAM_UNLOCK)) && ((cameraThirdPerson()) || (cameraFollow())) && (!getFocusOnAvatar()) )
{
setFocusOnAvatar(TRUE, FALSE);
setFocusOnAvatar(true, false);
}
// [/RLVa:KB]
@ -1287,8 +1287,8 @@ void LLAgentCamera::updateCamera()
if (cameraThirdPerson() && (mFocusOnAvatar || mAllowChangeToFollow) && LLFollowCamMgr::getInstance()->getActiveFollowCamParams())
{
mAllowChangeToFollow = FALSE;
mFocusOnAvatar = TRUE;
mAllowChangeToFollow = false;
mFocusOnAvatar = true;
changeCameraToFollow();
}
@ -1427,12 +1427,12 @@ void LLAgentCamera::updateCamera()
}
else
{
changeCameraToThirdPerson(TRUE);
changeCameraToThirdPerson(true);
}
}
}
BOOL hit_limit;
bool hit_limit;
LLVector3d camera_pos_global;
LLVector3d camera_target_global = calcCameraPositionTargetGlobal(&hit_limit);
mCameraVirtualPositionAgent = gAgent.getPosAgentFromGlobal(camera_target_global);
@ -1442,7 +1442,7 @@ void LLAgentCamera::updateCamera()
mCameraFOVZoomFactor = calcCameraFOVZoomFactor();
camera_target_global = focus_target_global + (camera_target_global - focus_target_global) * (1.f + mCameraFOVZoomFactor);
gAgent.setShowAvatar(TRUE); // can see avatar by default
gAgent.setShowAvatar(true); // can see avatar by default
// Adjust position for animation
if (mCameraAnimating)
@ -1455,8 +1455,8 @@ void LLAgentCamera::updateCamera()
// linear interpolation
F32 fraction_of_animation = time / mAnimationDuration;
BOOL isfirstPerson = mCameraMode == CAMERA_MODE_MOUSELOOK;
BOOL wasfirstPerson = mLastCameraMode == CAMERA_MODE_MOUSELOOK;
bool isfirstPerson = mCameraMode == CAMERA_MODE_MOUSELOOK;
bool wasfirstPerson = mLastCameraMode == CAMERA_MODE_MOUSELOOK;
F32 fraction_animation_to_skip;
if (mAnimationCameraStartGlobal == camera_target_global)
@ -1475,7 +1475,7 @@ void LLAgentCamera::updateCamera()
{
if (fraction_of_animation < animation_start_fraction || fraction_of_animation > animation_finish_fraction )
{
gAgent.setShowAvatar(FALSE);
gAgent.setShowAvatar(false);
}
// ...adjust position for animation
@ -1486,13 +1486,13 @@ void LLAgentCamera::updateCamera()
else
{
// ...animation complete
mCameraAnimating = FALSE;
mCameraAnimating = false;
camera_pos_global = camera_target_global;
mFocusGlobal = focus_target_global;
gAgent.endAnimationUpdateUI();
gAgent.setShowAvatar(TRUE);
gAgent.setShowAvatar(true);
}
if (isAgentAvatarValid() && (mCameraMode != CAMERA_MODE_MOUSELOOK))
@ -1504,11 +1504,11 @@ void LLAgentCamera::updateCamera()
{
camera_pos_global = camera_target_global;
mFocusGlobal = focus_target_global;
gAgent.setShowAvatar(TRUE);
gAgent.setShowAvatar(true);
}
// smoothing
if (TRUE)
if (true)
{
LLVector3d agent_pos = gAgent.getPositionGlobal();
LLVector3d camera_pos_agent = camera_pos_global - agent_pos;
@ -1521,7 +1521,7 @@ void LLAgentCamera::updateCamera()
{
const F32 SMOOTHING_HALF_LIFE = 0.02f;
F32 smoothing = LLSmoothInterpolation::getInterpolant(gSavedSettings.getF32("CameraPositionSmoothing") * SMOOTHING_HALF_LIFE, FALSE);
F32 smoothing = LLSmoothInterpolation::getInterpolant(gSavedSettings.getF32("CameraPositionSmoothing") * SMOOTHING_HALF_LIFE, false);
if (mFocusOnAvatar && !mFocusObject) // we differentiate on avatar mode
{
@ -1851,7 +1851,7 @@ F32 LLAgentCamera::calcCameraFOVZoomFactor()
//-----------------------------------------------------------------------------
// calcCameraPositionTargetGlobal()
//-----------------------------------------------------------------------------
LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(bool *hit_limit)
{
// Compute base camera position and look-at points.
F32 camera_land_height;
@ -1859,7 +1859,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
gAgent.getPositionGlobal() :
gAgent.getPosGlobalFromAgent(getAvatarRootPosition());
BOOL isConstrained = FALSE;
bool isConstrained = false;
LLVector3d head_offset;
head_offset.setVec(mThirdPersonHeadOffset);
@ -2088,7 +2088,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
if(camera_distance > max_dist)
{
camera_position_global = gAgent.getPositionGlobal() + (max_dist/camera_distance)*camera_offset;
isConstrained = TRUE;
isConstrained = true;
}
}
@ -2099,7 +2099,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
// {
// camera_position_global = last_position_global;
//
// isConstrained = TRUE;
// isConstrained = true;
// }
}
@ -2131,7 +2131,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
const LLVector3d offsetCamera(gAgent.getFrameAgent().rotateToAbsolute(offsetCameraLocal));
const LLVector3d posFocusCam = frame_center_global + head_offset + offsetCamera;
if (clampCameraPosition(camera_position_global, posFocusCam, nCamOriginDistLimitMin, nCamOriginDistLimitMax))
isConstrained = TRUE;
isConstrained = true;
}
// Check avatar distance limits
@ -2139,7 +2139,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
{
const LLVector3d posAvatarCam = gAgent.getPosGlobalFromAgent( (isAgentAvatarValid()) ? gAgentAvatarp->mHeadp->getWorldPosition() : gAgent.getPositionAgent() );
if (clampCameraPosition(camera_position_global, posAvatarCam, nCamAvDistLimitMin, nCamAvDistLimitMax))
isConstrained = TRUE;
isConstrained = true;
}
}
// [/RLVa:KB]
@ -2151,7 +2151,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
if (camera_position_global.mdV[VZ] < minZ)
{
camera_position_global.mdV[VZ] = minZ;
isConstrained = TRUE;
isConstrained = true;
}
if (hit_limit)
@ -2306,7 +2306,7 @@ void LLAgentCamera::handleScrollWheel(S32 clicks)
mFollowCam.zoom(clicks);
if (mFollowCam.isZoomedToMinimumDistance())
{
changeCameraToMouselook(FALSE);
changeCameraToMouselook(false);
}
}
}
@ -2335,7 +2335,7 @@ void LLAgentCamera::handleScrollWheel(S32 clicks)
else if (mFocusOnAvatar && (mCameraMode == CAMERA_MODE_THIRD_PERSON))
{
// <FS:Zi> Camera focus and offset with CTRL/SHIFT + Scroll wheel
MASK mask = gKeyboard->currentMask(TRUE);
MASK mask = gKeyboard->currentMask(true);
if (mask & MASK_SHIFT)
{
LLVector3d offset = gSavedSettings.getVector3d("FocusOffsetRearView");
@ -2412,7 +2412,7 @@ void LLAgentCamera::resetCamera()
//-----------------------------------------------------------------------------
// changeCameraToMouselook()
//-----------------------------------------------------------------------------
void LLAgentCamera::changeCameraToMouselook(BOOL animate)
void LLAgentCamera::changeCameraToMouselook(bool animate)
{
if (!gSavedSettings.getBOOL("EnableMouselook")
// [RLVa:KB] - Checked: RLVa-2.0.0
@ -2454,7 +2454,7 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate)
updateLastCamera();
mCameraMode = CAMERA_MODE_MOUSELOOK;
// <FS:Zi> Animation Overrider
AOEngine::getInstance()->inMouselook(TRUE);
AOEngine::getInstance()->inMouselook(true);
const U32 old_flags = gAgent.getControlFlags();
gAgent.setControlFlags(AGENT_CONTROL_MOUSELOOK);
if (old_flags != gAgent.getControlFlags())
@ -2468,7 +2468,7 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate)
}
else
{
mCameraAnimating = FALSE;
mCameraAnimating = false;
gAgent.endAnimationUpdateUI();
}
}
@ -2504,7 +2504,7 @@ void LLAgentCamera::changeCameraToDefault()
//-----------------------------------------------------------------------------
// changeCameraToFollow()
//-----------------------------------------------------------------------------
void LLAgentCamera::changeCameraToFollow(BOOL animate)
void LLAgentCamera::changeCameraToFollow(bool animate)
{
if (LLViewerJoystick::getInstance()->getOverrideCamera())
{
@ -2515,14 +2515,14 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate)
{
if (mCameraMode == CAMERA_MODE_MOUSELOOK)
{
animate = FALSE;
animate = false;
}
startCameraAnimation();
updateLastCamera();
mCameraMode = CAMERA_MODE_FOLLOW;
// <FS:Zi> Animation Overrider
AOEngine::getInstance()->inMouselook(FALSE);
AOEngine::getInstance()->inMouselook(false);
// bang-in the current focus, position, and up vector of the follow cam
mFollowCam.reset(mCameraPositionAgent, LLViewerCamera::getInstance()->getPointOfInterest(), LLVector3::z_axis);
@ -2551,7 +2551,7 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate)
}
else
{
mCameraAnimating = FALSE;
mCameraAnimating = false;
gAgent.endAnimationUpdateUI();
}
}
@ -2560,7 +2560,7 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate)
//-----------------------------------------------------------------------------
// changeCameraToThirdPerson()
//-----------------------------------------------------------------------------
void LLAgentCamera::changeCameraToThirdPerson(BOOL animate)
void LLAgentCamera::changeCameraToThirdPerson(bool animate)
{
if (LLViewerJoystick::getInstance()->getOverrideCamera())
{
@ -2599,12 +2599,12 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate)
{
mCurrentCameraDistance = MIN_CAMERA_DISTANCE;
mTargetCameraDistance = MIN_CAMERA_DISTANCE;
animate = FALSE;
animate = false;
}
updateLastCamera();
mCameraMode = CAMERA_MODE_THIRD_PERSON;
// <FS:Zi> Animation Overrider
AOEngine::getInstance()->inMouselook(FALSE);
AOEngine::getInstance()->inMouselook(false);
gAgent.clearControlFlags(AGENT_CONTROL_MOUSELOOK);
}
@ -2624,7 +2624,7 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate)
}
else
{
mCameraAnimating = FALSE;
mCameraAnimating = false;
gAgent.endAnimationUpdateUI();
}
}
@ -2671,7 +2671,7 @@ void LLAgentCamera::changeCameraToCustomizeAvatar()
gFocusMgr.setMouseCapture( NULL );
if( gMorphView )
{
gMorphView->setVisible( TRUE );
gMorphView->setVisible( true );
}
// Remove any pitch or rotation from the avatar
LLVector3 at = gAgent.getAtAxis();
@ -2680,7 +2680,7 @@ void LLAgentCamera::changeCameraToCustomizeAvatar()
gAgent.resetAxes(at);
gAgent.sendAnimationRequest(ANIM_AGENT_CUSTOMIZE, ANIM_REQUEST_START);
gAgent.setCustomAnim(TRUE);
gAgent.setCustomAnim(true);
gAgentAvatarp->startMotion(ANIM_AGENT_CUSTOMIZE);
LLMotion* turn_motion = gAgentAvatarp->findMotion(ANIM_AGENT_CUSTOMIZE);
@ -2741,7 +2741,7 @@ void LLAgentCamera::switchCameraPreset(ECameraPreset preset)
mCameraZoomFraction = 1.f;
//focusing on avatar in that case means following him on movements
mFocusOnAvatar = TRUE;
mFocusOnAvatar = true;
mCameraPreset = preset;
@ -2779,7 +2779,7 @@ void LLAgentCamera::startCameraAnimation()
mAnimationFocusStartGlobal = mFocusGlobal;
setAnimationDuration(gSavedSettings.getF32("ZoomTime"));
mAnimationTimer.reset();
mCameraAnimating = TRUE;
mCameraAnimating = true;
}
//-----------------------------------------------------------------------------
@ -2787,7 +2787,7 @@ void LLAgentCamera::startCameraAnimation()
//-----------------------------------------------------------------------------
void LLAgentCamera::stopCameraAnimation()
{
mCameraAnimating = FALSE;
mCameraAnimating = false;
}
void LLAgentCamera::clearFocusObject()
@ -2968,7 +2968,7 @@ void LLAgentCamera::setCameraPosAndFocusGlobal(const LLVector3d& camera_pos, con
//-----------------------------------------------------------------------------
void LLAgentCamera::setSitCamera(const LLUUID &object_id, const LLVector3 &camera_pos, const LLVector3 &camera_focus)
{
BOOL camera_enabled = !object_id.isNull();
bool camera_enabled = !object_id.isNull();
if (camera_enabled)
{
@ -2979,7 +2979,7 @@ void LLAgentCamera::setSitCamera(const LLUUID &object_id, const LLVector3 &camer
mSitCameraPos = camera_pos;
mSitCameraFocus = camera_focus;
mSitCameraReferenceObject = reference_object;
mSitCameraEnabled = TRUE;
mSitCameraEnabled = true;
}
}
else
@ -2987,14 +2987,14 @@ void LLAgentCamera::setSitCamera(const LLUUID &object_id, const LLVector3 &camer
mSitCameraPos.clearVec();
mSitCameraFocus.clearVec();
mSitCameraReferenceObject = NULL;
mSitCameraEnabled = FALSE;
mSitCameraEnabled = false;
}
}
//-----------------------------------------------------------------------------
// setFocusOnAvatar()
//-----------------------------------------------------------------------------
void LLAgentCamera::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate, BOOL reset_axes)
void LLAgentCamera::setFocusOnAvatar(bool focus_on_avatar, bool animate, bool reset_axes)
{
if (focus_on_avatar != mFocusOnAvatar)
{
@ -3041,14 +3041,14 @@ void LLAgentCamera::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate, BOOL re
{
// keep camera focus point consistent, even though it is now unlocked
setFocusGlobal(gAgent.getPositionGlobal() + calcThirdPersonFocusOffset(), gAgent.getID());
mAllowChangeToFollow = FALSE;
mAllowChangeToFollow = false;
}
mFocusOnAvatar = focus_on_avatar;
}
BOOL LLAgentCamera::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
bool LLAgentCamera::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
{
static LLCachedControl<bool> isLocalPrivate(gSavedSettings, "PrivateLocalLookAtTarget", false);
@ -3128,7 +3128,7 @@ void LLAgentCamera::lookAtLastChat()
new_camera_pos += left * 0.3f;
new_camera_pos += up * 0.2f;
setFocusOnAvatar(FALSE, FALSE);
setFocusOnAvatar(false, false);
if (chatter_av->mHeadp)
{
@ -3159,7 +3159,7 @@ void LLAgentCamera::lookAtLastChat()
new_camera_pos += left * 0.3f;
new_camera_pos += up * 0.2f;
setFocusOnAvatar(FALSE, FALSE);
setFocusOnAvatar(false, false);
setFocusGlobal(chatter->getPositionGlobal(), gAgent.getLastChatter());
mCameraFocusOffsetTarget = gAgent.getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
@ -3171,7 +3171,7 @@ bool LLAgentCamera::isfollowCamLocked()
return mFollowCam.getPositionLocked();
}
BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
bool LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
{
// <FS:Ansariel> Remember the current object point pointed at - we might need it later
mPointAtObject = object;
@ -3186,7 +3186,7 @@ BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object,
mPointAt->markDead();
}
return FALSE;
return false;
}
// </FS:Ansariel>
@ -3194,7 +3194,7 @@ BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object,
//this is the editing arm motion
if (object && (object->isAttachment() || object->isAvatar()))
{
return FALSE;
return false;
}
if (!mPointAt || mPointAt->isDead())
{

54
indra/newview/llagentcamera.h
View File

@ -99,14 +99,14 @@ private:
//--------------------------------------------------------------------
public:
void changeCameraToDefault();
void changeCameraToMouselook(BOOL animate = TRUE);
void changeCameraToThirdPerson(BOOL animate = TRUE);
void changeCameraToMouselook(bool animate = true);
void changeCameraToThirdPerson(bool animate = true);
void changeCameraToCustomizeAvatar(); // Trigger transition animation
void changeCameraToFollow(BOOL animate = TRUE); // Ventrella
BOOL cameraThirdPerson() const { return (mCameraMode == CAMERA_MODE_THIRD_PERSON && mLastCameraMode == CAMERA_MODE_THIRD_PERSON); }
BOOL cameraMouselook() const { return (mCameraMode == CAMERA_MODE_MOUSELOOK && mLastCameraMode == CAMERA_MODE_MOUSELOOK); }
BOOL cameraCustomizeAvatar() const { return (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR /*&& !mCameraAnimating*/); }
BOOL cameraFollow() const { return (mCameraMode == CAMERA_MODE_FOLLOW && mLastCameraMode == CAMERA_MODE_FOLLOW); }
void changeCameraToFollow(bool animate = true); // Ventrella
bool cameraThirdPerson() const { return (mCameraMode == CAMERA_MODE_THIRD_PERSON && mLastCameraMode == CAMERA_MODE_THIRD_PERSON); }
bool cameraMouselook() const { return (mCameraMode == CAMERA_MODE_MOUSELOOK && mLastCameraMode == CAMERA_MODE_MOUSELOOK); }
bool cameraCustomizeAvatar() const { return (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR /*&& !mCameraAnimating*/); }
bool cameraFollow() const { return (mCameraMode == CAMERA_MODE_FOLLOW && mLastCameraMode == CAMERA_MODE_FOLLOW); }
ECameraMode getCameraMode() const { return mCameraMode; }
ECameraMode getLastCameraMode() const { return mLastCameraMode; }
void updateCamera(); // Call once per frame to update camera location/orientation
@ -173,10 +173,10 @@ private:
public:
LLVector3d getCameraPositionGlobal() const;
const LLVector3 &getCameraPositionAgent() const;
LLVector3d calcCameraPositionTargetGlobal(BOOL *hit_limit = NULL); // Calculate the camera position target
LLVector3d calcCameraPositionTargetGlobal(bool *hit_limit = NULL); // Calculate the camera position target
F32 getCameraMinOffGround(); // Minimum height off ground for this mode, meters
void setCameraCollidePlane(const LLVector4 &plane) { mCameraCollidePlane = plane; }
BOOL calcCameraMinDistance(F32 &obj_min_distance);
bool calcCameraMinDistance(F32 &obj_min_distance);
F32 getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.length(); }
void clearCameraLag() { mCameraLag.clearVec(); }
private:
@ -209,12 +209,12 @@ private:
//--------------------------------------------------------------------
public:
void setupSitCamera();
BOOL sitCameraEnabled() { return mSitCameraEnabled; }
bool sitCameraEnabled() { return mSitCameraEnabled; }
void setSitCamera(const LLUUID &object_id,
const LLVector3 &camera_pos = LLVector3::zero, const LLVector3 &camera_focus = LLVector3::zero);
private:
LLPointer<LLViewerObject> mSitCameraReferenceObject; // Object to which camera is related when sitting
BOOL mSitCameraEnabled; // Use provided camera information when sitting?
bool mSitCameraEnabled; // Use provided camera information when sitting?
LLVector3 mSitCameraPos; // Root relative camera pos when sitting
LLVector3 mSitCameraFocus; // Root relative camera target when sitting
@ -222,15 +222,15 @@ private:
// Animation
//--------------------------------------------------------------------
public:
void setCameraAnimating(BOOL b) { mCameraAnimating = b; }
BOOL getCameraAnimating() { return mCameraAnimating; }
void setCameraAnimating(bool b) { mCameraAnimating = b; }
bool getCameraAnimating() { return mCameraAnimating; }
void setAnimationDuration(F32 seconds);
void startCameraAnimation();
void stopCameraAnimation();
private:
LLFrameTimer mAnimationTimer; // Seconds that transition animation has been active
F32 mAnimationDuration; // In seconds
BOOL mCameraAnimating; // Camera is transitioning from one mode to another
bool mCameraAnimating; // Camera is transitioning from one mode to another
LLVector3d mAnimationCameraStartGlobal; // Camera start position, global coords
LLVector3d mAnimationFocusStartGlobal; // Camera focus point, global coords
@ -240,26 +240,26 @@ private:
public:
LLVector3d calcFocusPositionTargetGlobal();
LLVector3 calcFocusOffset(LLViewerObject *object, LLVector3 pos_agent, S32 x, S32 y);
BOOL getFocusOnAvatar() const { return mFocusOnAvatar; }
bool getFocusOnAvatar() const { return mFocusOnAvatar; }
LLPointer<LLViewerObject>& getFocusObject() { return mFocusObject; }
F32 getFocusObjectDist() const { return mFocusObjectDist; }
void updateFocusOffset();
void validateFocusObject();
void setFocusGlobal(const LLPickInfo& pick);
void setFocusGlobal(const LLVector3d &focus, const LLUUID &object_id = LLUUID::null);
void setFocusOnAvatar(BOOL focus, BOOL animate, BOOL reset_axes = TRUE);
void setFocusOnAvatar(bool focus, bool animate, bool reset_axes = true);
void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
void clearFocusObject();
void setFocusObject(LLViewerObject* object);
void setAllowChangeToFollow(BOOL focus) { mAllowChangeToFollow = focus; }
void setObjectTracking(BOOL track) { mTrackFocusObject = track; }
void setAllowChangeToFollow(bool focus) { mAllowChangeToFollow = focus; }
void setObjectTracking(bool track) { mTrackFocusObject = track; }
const LLVector3d &getFocusGlobal() const { return mFocusGlobal; }
const LLVector3d &getFocusTargetGlobal() const { return mFocusTargetGlobal; }
private:
LLVector3d mCameraFocusOffset; // Offset from focus point in build mode
LLVector3d mCameraFocusOffsetTarget; // Target towards which we are lerping the camera's focus offset
BOOL mFocusOnAvatar;
BOOL mAllowChangeToFollow;
bool mFocusOnAvatar;
bool mAllowChangeToFollow;
LLVector3d mFocusGlobal;
LLVector3d mFocusTargetGlobal;
LLPointer<LLViewerObject> mFocusObject;
@ -272,11 +272,11 @@ private:
//--------------------------------------------------------------------
public:
void updateLookAt(const S32 mouse_x, const S32 mouse_y);
BOOL setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero);
bool setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero);
ELookAtType getLookAtType();
void lookAtLastChat();
void slamLookAt(const LLVector3 &look_at); // Set the physics data
BOOL setPointAt(EPointAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero);
bool setPointAt(EPointAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero);
EPointAtType getPointAtType();
public:
LLPointer<LLHUDEffectLookAt> mLookAt;
@ -331,8 +331,8 @@ public:
public:
// Called whenever the agent moves. Puts camera back in default position, deselects items, etc.
// <FS:CR> FIRE-8798: Option to prevent camera reset on movement
//void resetView(BOOL reset_camera = TRUE, BOOL change_camera = FALSE);
void resetView(BOOL reset_camera = TRUE, BOOL change_camera = FALSE, BOOL movement = FALSE);
//void resetView(bool reset_camera = true, bool change_camera = false);
void resetView(bool reset_camera = true, bool change_camera = false, bool movement = false);
// </FS:CR>
// Called on camera movement. Unlocks camera from the default position behind the avatar.
void unlockView();
@ -343,10 +343,10 @@ public:
// Mouselook
//--------------------------------------------------------------------
public:
BOOL getForceMouselook() const { return mForceMouselook; }
void setForceMouselook(BOOL mouselook) { mForceMouselook = mouselook; }
bool getForceMouselook() const { return mForceMouselook; }
void setForceMouselook(bool mouselook) { mForceMouselook = mouselook; }
private:
BOOL mForceMouselook;
bool mForceMouselook;
//--------------------------------------------------------------------
// HUD

10
indra/newview/llagentlistener.cpp
View File

@ -380,10 +380,10 @@ void LLAgentListener::startAutoPilot(LLSD const & event_data)
rotation_threshold = event_data["rotation_threshold"].asReal();
}
BOOL allow_flying = TRUE;
bool allow_flying = true;
if (event_data.has("allow_flying"))
{
allow_flying = (BOOL) event_data["allow_flying"].asBoolean();
allow_flying = (bool) event_data["allow_flying"].asBoolean();
mAgent.setFlying(allow_flying);
}
@ -444,10 +444,10 @@ void LLAgentListener::startFollowPilot(LLSD const & event_data)
{
LLUUID target_id;
BOOL allow_flying = TRUE;
bool allow_flying = true;
if (event_data.has("allow_flying"))
{
allow_flying = (BOOL) event_data["allow_flying"].asBoolean();
allow_flying = (bool) event_data["allow_flying"].asBoolean();
}
if (event_data.has("leader_id"))
@ -502,7 +502,7 @@ void LLAgentListener::setAutoPilotTarget(LLSD const & event_data) const
void LLAgentListener::stopAutoPilot(LLSD const & event_data) const
{
BOOL user_cancel = FALSE;
bool user_cancel = false;
if (event_data.has("user_cancel"))
{
user_cancel = event_data["user_cancel"].asBoolean();

2
indra/newview/llagentpicksinfo.h
View File

@ -60,7 +60,7 @@ public:
S32 getMaxNumberOfPicks() { return mMaxNumberOfPicks; }
/**
* Returns TRUE if Agent has maximum allowed number of Picks.
* Returns true if Agent has maximum allowed number of Picks.
*/
bool isPickLimitReached();

28
indra/newview/llagentpilot.cpp
View File

@ -42,15 +42,15 @@ LLAgentPilot gAgentPilot;
LLAgentPilot::LLAgentPilot() :
mNumRuns(-1),
mQuitAfterRuns(FALSE),
mRecording(FALSE),
mQuitAfterRuns(false),
mRecording(false),
mLastRecordTime(0.f),
mStarted(FALSE),
mPlaying(FALSE),
mStarted(false),
mPlaying(false),
mCurrentAction(0),
mOverrideCamera(FALSE),
mLoop(TRUE),
mReplaySession(FALSE)
mOverrideCamera(false),
mLoop(true),
mReplaySession(false)
{
}
@ -221,14 +221,14 @@ void LLAgentPilot::startRecord()
mActions.clear();
mTimer.reset();
addAction(STRAIGHT);
mRecording = TRUE;
mRecording = true;
}
void LLAgentPilot::stopRecord()
{
gAgentPilot.addAction(STRAIGHT);
gAgentPilot.save();
mRecording = FALSE;
mRecording = false;
}
void LLAgentPilot::addAction(enum EActionType action_type)
@ -252,7 +252,7 @@ void LLAgentPilot::startPlayback()
{
if (!mPlaying)
{
mPlaying = TRUE;
mPlaying = true;
mCurrentAction = 0;
mTimer.reset();
@ -261,12 +261,12 @@ void LLAgentPilot::startPlayback()
LL_INFOS() << "Starting playback, moving to waypoint 0" << LL_ENDL;
gAgent.startAutoPilotGlobal(mActions[0].mTarget);
moveCamera();
mStarted = FALSE;
mStarted = false;
}
else
{
LL_INFOS() << "No autopilot data, cancelling!" << LL_ENDL;
mPlaying = FALSE;
mPlaying = false;
}
}
}
@ -275,7 +275,7 @@ void LLAgentPilot::stopPlayback()
{
if (mPlaying)
{
mPlaying = FALSE;
mPlaying = false;
mCurrentAction = 0;
mTimer.reset();
gAgent.stopAutoPilot();
@ -347,7 +347,7 @@ void LLAgentPilot::updateTarget()
{
LL_INFOS() << "At start, beginning playback" << LL_ENDL;
mTimer.reset();
mStarted = TRUE;
mStarted = true;
}
}
}

24
indra/newview/llagentpilot.h
View File

@ -68,35 +68,35 @@ public:
void addWaypoint();
void moveCamera();
void setReplaySession(BOOL new_val) { mReplaySession = new_val; }
BOOL getReplaySession() { return mReplaySession; }
void setReplaySession(bool new_val) { mReplaySession = new_val; }
bool getReplaySession() { return mReplaySession; }
void setLoop(BOOL new_val) { mLoop = new_val; }
BOOL getLoop() { return mLoop; }
void setLoop(bool new_val) { mLoop = new_val; }
bool getLoop() { return mLoop; }
void setQuitAfterRuns(BOOL quit_val) { mQuitAfterRuns = quit_val; }
void setQuitAfterRuns(bool quit_val) { mQuitAfterRuns = quit_val; }
void setNumRuns(S32 num_runs) { mNumRuns = num_runs; }
private:
BOOL mLoop;
BOOL mReplaySession;
bool mLoop;
bool mReplaySession;
S32 mNumRuns;
BOOL mQuitAfterRuns;
bool mQuitAfterRuns;
void setAutopilotTarget(const S32 id);
BOOL mRecording;
bool mRecording;
F32 mLastRecordTime;
BOOL mStarted;
BOOL mPlaying;
bool mStarted;
bool mPlaying;
S32 mCurrentAction;
BOOL mOverrideCamera;
bool mOverrideCamera;
class Action
{

10
indra/newview/llagentui.cpp
View File

@ -90,19 +90,19 @@ void LLAgentUI::buildSLURL(LLSLURL& slurl, const bool escaped /*= true*/)
}
//static
BOOL LLAgentUI::checkAgentDistance(const LLVector3& pole, F32 radius)
bool LLAgentUI::checkAgentDistance(const LLVector3& pole, F32 radius)
{
F32 delta_x = gAgent.getPositionAgent().mV[VX] - pole.mV[VX];
F32 delta_y = gAgent.getPositionAgent().mV[VY] - pole.mV[VY];
return sqrt( delta_x* delta_x + delta_y* delta_y ) < radius;
}
BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region)
bool LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region)
{
LLViewerRegion* region = gAgent.getRegion();
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (!region || !parcel) return FALSE;
if (!region || !parcel) return false;
S32 pos_x = S32(agent_pos_region.mV[VX] + 0.5f);
S32 pos_y = S32(agent_pos_region.mV[VY] + 0.5f);
@ -324,9 +324,9 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
}
}
str = buffer;
return TRUE;
return true;
}
BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt)
bool LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt)
{
return buildLocationString(str,fmt, gAgent.getPositionAgent());
}

6
indra/newview/llagentui.h
View File

@ -48,14 +48,14 @@ public:
static void buildSLURL(LLSLURL& slurl, const bool escaped = true);
//build location string using the current position of gAgent.
static BOOL buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK);
static bool buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK);
//build location string using a region position of the avatar.
static BOOL buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region);
static bool buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region);
/**
* @brief Check whether the agent is in neighborhood of the pole Within same region
* @return true if the agent is in neighborhood.
*/
static BOOL checkAgentDistance(const LLVector3& local_pole, F32 radius);
static bool checkAgentDistance(const LLVector3& local_pole, F32 radius);
};
#endif //LLAGENTUI_H

2
indra/newview/llagentwearables.cpp
View File

@ -2063,7 +2063,7 @@ void LLAgentWearables::recoverMissingWearable(const LLWearableType::EType type,
LLViewerWearable* new_wearable = LLWearableList::instance().createNewWearable(type, gAgentAvatarp);
setWearable(type,index,new_wearable);
//new_wearable->writeToAvatar(TRUE);
//new_wearable->writeToAvatar(true);
// Add a new one in the lost and found folder.
// (We used to overwrite the "not found" one, but that could potentially

2
indra/newview/llagentwearablesfetch.cpp
View File

@ -307,7 +307,7 @@ void LLLibraryOutfitsFetch::doneIdle()
break;
default:
LL_WARNS() << "Got invalid state for outfit fetch: " << mCurrFetchStep << LL_ENDL;
mOutfitsPopulated = TRUE;
mOutfitsPopulated = true;
break;
}

6
indra/newview/llaisapi.cpp
View File

@ -1257,7 +1257,7 @@ void AISUpdate::parseItem(const LLSD& item_map)
// Default to current values where not provided.
new_item->copyViewerItem(curr_item);
}
BOOL rv = new_item->unpackMessage(item_map);
bool rv = new_item->unpackMessage(item_map);
if (rv)
{
if (mFetch)
@ -1302,7 +1302,7 @@ void AISUpdate::parseLink(const LLSD& link_map, S32 depth)
// Default to current values where not provided.
new_link->copyViewerItem(curr_link);
}
BOOL rv = new_link->unpackMessage(link_map);
bool rv = new_link->unpackMessage(link_map);
if (rv)
{
const LLUUID& parent_id = new_link->getParentUUID();
@ -1408,7 +1408,7 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth)
new_cat = new LLViewerInventoryCategory(LLUUID::null);
}
}
BOOL rv = new_cat->unpackMessage(category_map);
bool rv = new_cat->unpackMessage(category_map);
// *NOTE: unpackMessage does not unpack version or descendent count.
if (rv)
{

28
indra/newview/llappearancemgr.cpp
View File

@ -145,7 +145,7 @@ public:
void stop() { mEventTimer.stop(); }
void start() { mEventTimer.start(); }
void reset() { mEventTimer.reset(); }
BOOL getStarted() { return mEventTimer.getStarted(); }
bool getStarted() { return mEventTimer.getStarted(); }
LLTimer& getEventTimer() { return mEventTimer;}
};
@ -1788,7 +1788,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
LLInventoryModel::item_array_t items;
LLFindWearablesEx collector(/*is_worn=*/ true, /*include_body_parts=*/ false);
gInventory.collectDescendentsIf(cat_id, cats, items, FALSE, collector);
gInventory.collectDescendentsIf(cat_id, cats, items, false, collector);
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge())
@ -2002,7 +2002,7 @@ void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LL
}
}
BOOL LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
bool LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
{
// These are the wearable items that are required for considering this
// folder as containing a complete outfit.
@ -2029,7 +2029,7 @@ BOOL LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
}
}
// If the folder contains the required wearables, return TRUE.
// If the folder contains the required wearables, return true.
return ((required_wearables & folder_wearables) == required_wearables);
}
@ -3277,7 +3277,7 @@ void LLAppearanceMgr::wearInventoryCategoryOnAvatar( LLInventoryCategory* catego
LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "edit_outfit"));
}
LLAppearanceMgr::changeOutfit(TRUE, category->getUUID(), append);
LLAppearanceMgr::changeOutfit(true, category->getUUID(), append);
}
// FIXME do we really want to search entire inventory for matching name?
@ -4960,31 +4960,31 @@ void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
mAttachmentsChangeSignal(item_id);
}
BOOL LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
bool LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
{
const LLUUID& cof = getCOF();
if (obj_id == cof)
return TRUE;
return true;
const LLInventoryObject* obj = gInventory.getObject(obj_id);
if (obj && obj->getParentUUID() == cof)
return TRUE;
return FALSE;
return true;
return false;
}
BOOL LLAppearanceMgr::getIsProtectedCOFItem(const LLUUID& obj_id) const
bool LLAppearanceMgr::getIsProtectedCOFItem(const LLUUID& obj_id) const
{
if (!getIsInCOF(obj_id)) return FALSE;
if (!getIsInCOF(obj_id)) return false;
// If a non-link somehow ended up in COF, allow deletion.
const LLInventoryObject *obj = gInventory.getObject(obj_id);
if (obj && !obj->getIsLinkType())
{
return FALSE;
return false;
}
// For now, don't allow direct deletion from the COF. Instead, force users
// to choose "Detach" or "Take Off".
return TRUE;
return true;
}
class CallAfterCategoryFetchStage2: public LLInventoryFetchItemsObserver
@ -5295,7 +5295,7 @@ public:
LLAppearanceMgr::getInstance()->wearInventoryCategory(category, true, false);
// *TODOw: This may not be necessary if initial outfit is chosen already -- josh
gAgent.setOutfitChosen(TRUE);
gAgent.setOutfitChosen(true);
}
}

6
indra/newview/llappearancemgr.h
View File

@ -92,7 +92,7 @@ public:
LLPointer<LLInventoryCallback> cb);
// Return whether this folder contains minimal contents suitable for making a full outfit.
BOOL getCanMakeFolderIntoOutfit(const LLUUID& folder_id);
bool getCanMakeFolderIntoOutfit(const LLUUID& folder_id);
// Determine whether a given outfit can be removed.
bool getCanRemoveOutfit(const LLUUID& outfit_cat_id);
@ -318,9 +318,9 @@ private:
// Item-specific convenience functions
public:
// Is this in the COF?
BOOL getIsInCOF(const LLUUID& obj_id) const;
bool getIsInCOF(const LLUUID& obj_id) const;
// Is this in the COF and can the user delete it from the COF?
BOOL getIsProtectedCOFItem(const LLUUID& obj_id) const;
bool getIsProtectedCOFItem(const LLUUID& obj_id) const;
// Outfits will prioritize textures with such name to use for preview in gallery
static const std::string sExpectedTextureName;

114
indra/newview/llappviewer.cpp
View File

@ -314,8 +314,8 @@ static LLAppViewerListener sAppViewerListener(LLAppViewer::instance);
extern void init_apple_menu(const char* product);
#endif // LL_DARWIN
extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;
extern bool gRandomizeFramerate;
extern bool gPeriodicSlowFrame;
extern bool gDebugGL;
#if LL_DARWIN
@ -328,8 +328,8 @@ extern bool gHiDPISupport;
F32 gSimLastTime; // Used in LLAppViewer::init and send_viewer_stats()
F32 gSimFrames;
BOOL gShowObjectUpdates = FALSE;
BOOL gUseQuickTime = TRUE;
bool gShowObjectUpdates = false;
bool gUseQuickTime = true;
eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL;
S32 gLastExecDuration = -1; // (<0 indicates unknown)
@ -369,12 +369,12 @@ F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME;
S32 gPendingMetricsUploads = 0;
BOOL gDisconnected = FALSE;
bool gDisconnected = false;
// used to restore texture state after a mode switch
LLFrameTimer gRestoreGLTimer;
BOOL gRestoreGL = FALSE;
bool gUseWireframe = FALSE;
bool gRestoreGL = false;
bool gUseWireframe = false;
LLMemoryInfo gSysMemory;
U64Bytes gMemoryAllocated(0); // updated in display_stats() in llviewerdisplay.cpp
@ -386,16 +386,16 @@ LLVector3 gRelativeWindVec(0.0, 0.0, 0.0);
U32 gPacketsIn = 0;
BOOL gPrintMessagesThisFrame = FALSE;
bool gPrintMessagesThisFrame = false;
BOOL gRandomizeFramerate = FALSE;
BOOL gPeriodicSlowFrame = FALSE;
bool gRandomizeFramerate = false;
bool gPeriodicSlowFrame = false;
BOOL gCrashOnStartup = FALSE;
BOOL gLLErrorActivated = FALSE;
BOOL gLogoutInProgress = FALSE;
bool gCrashOnStartup = false;
bool gLLErrorActivated = false;
bool gLogoutInProgress = false;
BOOL gSimulateMemLeak = FALSE;
bool gSimulateMemLeak = false;
// We don't want anyone, especially threads working on the graphics pipeline,
// to have to block due to this WorkQueue being full.
@ -433,9 +433,9 @@ const std::string ERROR_MARKER_FILE_NAME(SAFE_FILE_NAME_PREFIX + ".error_marker"
const std::string LLERROR_MARKER_FILE_NAME(SAFE_FILE_NAME_PREFIX + ".llerror_marker"); //FS orig modified LL
const std::string LOGOUT_MARKER_FILE_NAME(SAFE_FILE_NAME_PREFIX + ".logout_marker"); //FS orig modified LL
//static BOOL gDoDisconnect = FALSE;
//static bool gDoDisconnect = false;
// [RLVa:KB] - Checked: RLVa-2.3
BOOL gDoDisconnect = FALSE;
bool gDoDisconnect = false;
// [/RLVa:KB]
static std::string gLaunchFileOnQuit;
@ -564,7 +564,7 @@ bool create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base)
LLIconCtrl* icon;
if( match->getMenuName() == "menu_url_group.xml" // See LLUrlEntryGroup constructor
|| gAgent.isInGroup(match_id, TRUE)) //This check seems unfiting, urls are either /agent or /group
|| gAgent.isInGroup(match_id, true)) //This check seems unfiting, urls are either /agent or /group
{
LLGroupIconCtrl::Params icon_params;
icon_params.group_id = match_id;
@ -647,7 +647,7 @@ static void settings_to_globals()
static void settings_modify()
{
LLPipeline::sRenderTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater");
LLPipeline::sRenderDeferred = TRUE; // FALSE is deprecated
LLPipeline::sRenderDeferred = true; // false is deprecated
LLRenderTarget::sUseFBO = LLPipeline::sRenderDeferred;
LLVOSurfacePatch::sLODFactor = gSavedSettings.getF32("RenderTerrainLODFactor");
LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
@ -730,8 +730,8 @@ LLAppViewer::LLAppViewer()
mLastAgentForceUpdate(0),
mMainloopTimeout(NULL),
mAgentRegionLastAlive(false),
mRandomizeFramerate(LLCachedControl<bool>(gSavedSettings,"Randomize Framerate", FALSE)),
mPeriodicSlowFrame(LLCachedControl<bool>(gSavedSettings,"Periodic Slow Frame", FALSE)),
mRandomizeFramerate(LLCachedControl<bool>(gSavedSettings,"Randomize Framerate", false)),
mPeriodicSlowFrame(LLCachedControl<bool>(gSavedSettings,"Periodic Slow Frame", false)),
mFastTimerLogThread(NULL),
mSettingsLocationList(NULL),
mIsFirstRun(false),
@ -1539,7 +1539,7 @@ bool LLAppViewer::frame()
}
catch (std::bad_alloc&)
{
LLMemory::logMemoryInfo(TRUE);
LLMemory::logMemoryInfo(true);
LLFloaterMemLeak* mem_leak_instance = LLFloaterReg::findTypedInstance<LLFloaterMemLeak>("mem_leaking");
if (mem_leak_instance)
{
@ -2018,7 +2018,7 @@ bool LLAppViewer::cleanup()
//flag all elements as needing to be destroyed immediately
// to ensure shutdown order
LLMortician::setZealous(TRUE);
LLMortician::setZealous(true);
// Give any remaining SLPlugin instances a chance to exit cleanly.
LLPluginProcessParent::shutdown();
@ -2060,11 +2060,11 @@ bool LLAppViewer::cleanup()
}
else
{
gSavedPerAccountSettings.saveToFile(per_account_settings_file, TRUE);
gSavedPerAccountSettings.saveToFile(per_account_settings_file, true);
LL_INFOS() << "First time: Saved per-account settings to " <<
per_account_settings_file << LL_ENDL;
}
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), true);
// /FIRE-4871
// <FS:Zi> Backup Settings
}
@ -2277,7 +2277,7 @@ bool LLAppViewer::cleanup()
// save their rects on delete.
if(mSaveSettingsOnExit) // <FS:Zi> Backup Settings
{
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), true);
LLUIColorTable::instance().saveUserSettings();
@ -2316,7 +2316,7 @@ bool LLAppViewer::cleanup()
}
else
{
gSavedPerAccountSettings.saveToFile(per_account_settings_file, TRUE);
gSavedPerAccountSettings.saveToFile(per_account_settings_file, true);
LL_INFOS() << "Second time: Saved per-account settings to " <<
per_account_settings_file << LL_ENDL;
@ -2334,12 +2334,12 @@ bool LLAppViewer::cleanup()
// </FS:Zi>
// We need to save all crash settings, even if they're defaults [see LLCrashLogger::loadCrashBehaviorSetting()]
gCrashSettings.saveToFile(gSavedSettings.getString("CrashSettingsFile"),FALSE);
gCrashSettings.saveToFile(gSavedSettings.getString("CrashSettingsFile"), false);
//std::string warnings_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Warnings"));
std::string warnings_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("User", "Warnings"));
if(mSaveSettingsOnExit) // <FS:Zi> Backup Settings
gWarningSettings.saveToFile(warnings_settings_filename, TRUE);
gWarningSettings.saveToFile(warnings_settings_filename, true);
// Save URL history file
if(mSaveSettingsOnExit) // <FS:Zi> Backup Settings
@ -2794,7 +2794,7 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
&& gSavedSettings.controlExists(file.file_name_setting))
{
// try to find filename stored in file_name_setting control
full_settings_path = gSavedSettings.getString(file.file_name_setting);
full_settings_path = gSavedSettings.getString(file.file_name_setting());
if (full_settings_path.empty())
{
continue;
@ -2913,7 +2913,7 @@ bool LLAppViewer::initConfiguration()
//Load settings files list
std::string settings_file_list = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings_files.xml");
LLXMLNodePtr root;
BOOL success = LLXMLNode::parseFile(settings_file_list, root, NULL);
bool success = LLXMLNode::parseFile(settings_file_list, root, NULL);
if (!success)
{
LL_WARNS() << "Cannot load default configuration file " << settings_file_list << LL_ENDL;
@ -3079,7 +3079,7 @@ bool LLAppViewer::initConfiguration()
gSavedSettings.setBOOL("FirstRunThisInstall", false);
}
// <FS:Beq> FIRE-29819 Set ForceShowGrid to TRUE always, unless expressly disabled
// <FS:Beq> FIRE-29819 Set ForceShowGrid to true always, unless expressly disabled
// FSOpenSimAlwaysForcesShowGrid is added to allow closed grids to soft disable the default behaviour
#if OPENSIM && !SINGLEGRID
if (!gSavedSettings.getBOOL("ForceShowGrid") && gSavedSettings.getBOOL("FSOpenSimAlwaysForceShowGrid"))
@ -3303,10 +3303,10 @@ bool LLAppViewer::initConfiguration()
if (gNonInteractive)
{
tempSetControl("AllowMultipleViewers", "TRUE");
tempSetControl("SLURLPassToOtherInstance", "FALSE");
tempSetControl("RenderWater", "FALSE");
tempSetControl("FlyingAtExit", "FALSE");
tempSetControl("AllowMultipleViewers", "true");
tempSetControl("SLURLPassToOtherInstance", "false");
tempSetControl("RenderWater", "false");
tempSetControl("FlyingAtExit", "false");
tempSetControl("WindowWidth", "1024");
tempSetControl("WindowHeight", "200");
LLError::setEnabledLogTypesMask(0);
@ -3399,7 +3399,7 @@ bool LLAppViewer::initConfiguration()
// <FS:Ansariel> Option to not save password if using login cmdline switch
if (clp.hasOption("logindontsavepassword") && clp.hasOption("login"))
{
gSavedSettings.setBOOL("FSLoginDontSavePassword", TRUE);
gSavedSettings.setBOOL("FSLoginDontSavePassword", true);
}
// </FS:Ansariel>
@ -3479,8 +3479,8 @@ bool LLAppViewer::initConfiguration()
if(disable_voice && !gSavedSettings.getBOOL("VoiceMultiInstance"))
// </FS:Ansariel>
{
const BOOL DO_NOT_PERSIST = FALSE;
disable_voice->setValue(LLSD(TRUE), DO_NOT_PERSIST);
const bool DO_NOT_PERSIST = false;
disable_voice->setValue(LLSD(true), DO_NOT_PERSIST);
}
}
@ -3615,7 +3615,7 @@ bool LLAppViewer::initWindow()
gHeadlessClient = gSavedSettings.getBOOL("HeadlessClient");
// always start windowed
BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
bool ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
LLViewerWindow::Params window_params;
window_params
@ -4251,7 +4251,7 @@ void LLAppViewer::cleanupSavedSettings()
// as we don't track it in callbacks
if(NULL != gViewerWindow)
{
BOOL maximized = gViewerWindow->getWindow()->getMaximized();
bool maximized = gViewerWindow->getWindow()->getMaximized();
if (!maximized)
{
LLCoordScreen window_pos;
@ -4557,7 +4557,7 @@ void LLAppViewer::processMarkerFiles()
initLoggingAndGetLastDuration();
// Create the marker file for this execution & lock it; it will be deleted on a clean exit
apr_status_t s;
s = mMarkerFile.open(mMarkerFileName, LL_APR_WB, TRUE);
s = mMarkerFile.open(mMarkerFileName, LL_APR_WB, true);
if (s == APR_SUCCESS && mMarkerFile.getFileHandle())
{
@ -4754,7 +4754,7 @@ void LLAppViewer::requestQuit()
gAgentAvatarp->updateAvatarRezMetrics(true); // force a last packet to be sent.
}
LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, true);
effectp->setPositionGlobal(gAgent.getPositionGlobal());
effectp->setColor(LLColor4U(gAgent.getEffectColor()));
LLHUDManager::getInstance()->sendEffects();
@ -4815,7 +4815,7 @@ static bool finish_early_exit(const LLSD& notification, const LLSD& response)
void LLAppViewer::earlyExit(const std::string& name, const LLSD& substitutions)
{
LL_WARNS() << "app_early_exit: " << name << LL_ENDL;
gDoDisconnect = TRUE;
gDoDisconnect = true;
LLNotificationsUtil::add(name, substitutions, LLSD(), finish_early_exit);
}
@ -4823,7 +4823,7 @@ void LLAppViewer::earlyExit(const std::string& name, const LLSD& substitutions)
void LLAppViewer::earlyExitNoNotify()
{
LL_WARNS() << "app_early_exit with no notification: " << LL_ENDL;
gDoDisconnect = TRUE;
gDoDisconnect = true;
finish_early_exit( LLSD(), LLSD() );
}
@ -4938,7 +4938,7 @@ U32 LLAppViewer::getObjectCacheVersion()
bool LLAppViewer::initCache()
{
mPurgeCache = false;
BOOL read_only = mSecondInstance ? TRUE : FALSE;
bool read_only = mSecondInstance ? true : false;
LLAppViewer::getTextureCache()->setReadOnly(read_only) ;
LLVOCache::initParamSingleton(read_only);
@ -5093,7 +5093,7 @@ bool LLAppViewer::initCache()
{
gDirUtilp->deleteDirAndContents(browser_cache);
}
gSavedSettings.setBOOL("FSStartupClearBrowserCache", FALSE);
gSavedSettings.setBOOL("FSStartupClearBrowserCache", false);
}
// </FS:Ansariel>
@ -5223,7 +5223,7 @@ void LLAppViewer::forceDisconnect(const std::string& mesg)
}
LLSD args;
gDoDisconnect = TRUE;
gDoDisconnect = true;
if (LLStartUp::getStartupState() < STATE_STARTED)
{
@ -5246,7 +5246,7 @@ void LLAppViewer::badNetworkHandler()
// Flush all of our caches on exit in the case of disconnect due to
// invalid packets.
mPurgeCacheOnExit = TRUE;
mPurgeCacheOnExit = true;
std::ostringstream message;
message <<
@ -5274,7 +5274,7 @@ void LLAppViewer::saveFinalSnapshot()
gSavedSettings.setVector3d("FocusPosOnLogout", gAgentCamera.calcFocusPositionTargetGlobal());
gSavedSettings.setVector3d("CameraPosOnLogout", gAgentCamera.calcCameraPositionTargetGlobal());
gViewerWindow->setCursor(UI_CURSOR_WAIT);
gAgentCamera.changeCameraToThirdPerson( FALSE ); // don't animate, need immediate switch
gAgentCamera.changeCameraToThirdPerson( false ); // don't animate, need immediate switch
gSavedSettings.setBOOL("ShowParcelOwners", false);
idle();
@ -5285,12 +5285,12 @@ void LLAppViewer::saveFinalSnapshot()
gViewerWindow->saveSnapshot(snap_filename,
gViewerWindow->getWindowWidthRaw(),
gViewerWindow->getWindowHeightRaw(),
FALSE,
false,
gSavedSettings.getBOOL("RenderHUDInSnapshot"),
TRUE,
true,
LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
mSavedFinalSnapshot = TRUE;
mSavedFinalSnapshot = true;
if (gAgent.isInHomeRegion())
{
@ -5532,7 +5532,7 @@ void LLAppViewer::idle()
// When appropriate, update agent location to the simulator.
F32 agent_update_time = agent_update_timer.getElapsedTimeF32();
F32 agent_force_update_time = mLastAgentForceUpdate + agent_update_time;
BOOL force_update = gAgent.controlFlagsDirty()
bool force_update = gAgent.controlFlagsDirty()
|| (mLastAgentControlFlags != gAgent.getControlFlags())
|| (agent_force_update_time > (1.0f / (F32) AGENT_FORCE_UPDATES_PER_SECOND));
if (force_update || (agent_update_time > (1.0f / (F32) AGENT_UPDATES_PER_SECOND)))
@ -5949,7 +5949,7 @@ void LLAppViewer::sendLogoutRequest()
if(!mLogoutRequestSent && gMessageSystem)
{
//Set internal status variables and marker files before actually starting the logout process
gLogoutInProgress = TRUE;
gLogoutInProgress = true;
if (!mSecondInstance)
{
mLogoutMarkerFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LOGOUT_MARKER_FILE_NAME);
@ -5979,7 +5979,7 @@ void LLAppViewer::sendLogoutRequest()
gLogoutTimer.reset();
gLogoutMaxTime = LOGOUT_REQUEST_TIME;
mLogoutRequestSent = TRUE;
mLogoutRequestSent = true;
if(LLVoiceClient::instanceExists())
{
@ -6166,7 +6166,7 @@ void LLAppViewer::idleNetwork()
if (gPrintMessagesThisFrame)
{
LL_INFOS() << "Decoded " << total_decoded << " msgs this frame!" << LL_ENDL;
gPrintMessagesThisFrame = FALSE;
gPrintMessagesThisFrame = false;
}
}
add(LLStatViewer::NUM_NEW_OBJECTS, gObjectList.mNumNewObjects);
@ -6282,7 +6282,7 @@ void LLAppViewer::disconnectViewer()
LLDestroyClassList::instance().fireCallbacks();
cleanup_xfer_manager();
gDisconnected = TRUE;
gDisconnected = true;
// Pass the connection state to LLUrlEntryParcel not to attempt
// parcel info requests while disconnected.

14
indra/newview/llappviewer.h
View File

@ -374,7 +374,7 @@ const S32 AGENT_FORCE_UPDATES_PER_SECOND = 1;
// "// llstartup" indicates that llstartup is the only client for this global.
extern LLSD gDebugInfo;
extern BOOL gShowObjectUpdates;
extern bool gShowObjectUpdates;
typedef enum
{
@ -415,10 +415,10 @@ extern S32 gPendingMetricsUploads;
extern F32 gSimLastTime;
extern F32 gSimFrames;
extern BOOL gDisconnected;
extern bool gDisconnected;
extern LLFrameTimer gRestoreGLTimer;
extern BOOL gRestoreGL;
extern bool gRestoreGL;
extern bool gUseWireframe;
extern LLMemoryInfo gSysMemory;
@ -429,13 +429,13 @@ extern std::string gLastVersionChannel;
extern LLVector3 gWindVec;
extern LLVector3 gRelativeWindVec;
extern U32 gPacketsIn;
extern BOOL gPrintMessagesThisFrame;
extern bool gPrintMessagesThisFrame;
extern LLUUID gBlackSquareID;
extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;
extern bool gRandomizeFramerate;
extern bool gPeriodicSlowFrame;
extern BOOL gSimulateMemLeak;
extern bool gSimulateMemLeak;
#endif // LL_LLAPPVIEWER_H

8
indra/newview/llappviewerwin32.cpp
View File

@ -969,19 +969,19 @@ bool LLAppViewerWin32::initHardwareTest()
// Do driver verification and initialization based on DirectX
// hardware polling and driver versions
//
if (/*TRUE == gSavedSettings.getBOOL("ProbeHardwareOnStartup") &&*/ FALSE == gSavedSettings.getBOOL("NoHardwareProbe")) // <FS:Ansariel> FIRE-20378 / FIRE-20382: Breaks memory detection an 4K monitor workaround
if (/*true == gSavedSettings.getBOOL("ProbeHardwareOnStartup") &&*/ false == gSavedSettings.getBOOL("NoHardwareProbe")) // <FS:Ansariel> FIRE-20378 / FIRE-20382: Breaks memory detection an 4K monitor workaround
{
// per DEV-11631 - disable hardware probing for everything
// but vram.
BOOL vram_only = TRUE;
bool vram_only = true;
LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware"));
LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
gDXHardware.setWriteDebugFunc(write_debug_dx);
// <FS:Ansariel> FIRE-15891: Add option to disable WMI check in case of problems
//BOOL probe_ok = gDXHardware.getInfo(vram_only);
BOOL probe_ok = gDXHardware.getInfo(vram_only, gSavedSettings.getBOOL("FSDisableWMIProbing"));
//bool probe_ok = gDXHardware.getInfo(vram_only);
bool probe_ok = gDXHardware.getInfo(vram_only, gSavedSettings.getBOOL("FSDisableWMIProbing"));
// </FS:Ansariel>
if (!probe_ok

14
indra/newview/llattachmentsmgr.cpp
View File

@ -80,11 +80,11 @@ LLAttachmentsMgr::~LLAttachmentsMgr()
//void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
// const U8 attachment_pt,
// const BOOL add)
// const bool add)
// [RLVa:KB] - Checked: 2010-09-13 (RLVa-1.2.1)
void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
const U8 attachment_pt,
const BOOL add, const BOOL fRlvForce /*=FALSE*/)
const bool add, const bool fRlvForce /*=false*/)
// [/RLVa:KB]
{
LLViewerInventoryItem *item = gInventory.getItem(item_id);
@ -420,18 +420,18 @@ void LLAttachmentsMgr::LLItemRequestTimes::removeTime(const LLUUID& inv_item_id)
}
}
BOOL LLAttachmentsMgr::LLItemRequestTimes::getTime(const LLUUID& inv_item_id, LLTimer& timer) const
bool LLAttachmentsMgr::LLItemRequestTimes::getTime(const LLUUID& inv_item_id, LLTimer& timer) const
{
std::map<LLUUID,LLTimer>::const_iterator it = (*this).find(inv_item_id);
if (it != (*this).end())
{
timer = it->second;
return TRUE;
return true;
}
return FALSE;
return false;
}
BOOL LLAttachmentsMgr::LLItemRequestTimes::wasRequestedRecently(const LLUUID& inv_item_id) const
bool LLAttachmentsMgr::LLItemRequestTimes::wasRequestedRecently(const LLUUID& inv_item_id) const
{
LLTimer request_time;
if (getTime(inv_item_id, request_time))
@ -441,7 +441,7 @@ BOOL LLAttachmentsMgr::LLItemRequestTimes::wasRequestedRecently(const LLUUID& in
}
else
{
return FALSE;
return false;
}
}

10
indra/newview/llattachmentsmgr.h
View File

@ -69,18 +69,18 @@ public:
{
LLUUID mItemID;
U8 mAttachmentPt;
BOOL mAdd;
bool mAdd;
};
typedef std::deque<AttachmentsInfo> attachments_vec_t;
// [RLVa:KB] - Checked: 2010-09-13 (RLVa-1.2.1)
void addAttachmentRequest(const LLUUID& item_id,
const U8 attachment_pt,
const BOOL add, const BOOL fRlvForce = FALSE);
const bool add, const bool fRlvForce = false);
// [/RLVa:KB]
// void addAttachmentRequest(const LLUUID& item_id,
// const U8 attachment_pt,
// const BOOL add);
// const bool add);
void onAttachmentRequested(const LLUUID& item_id);
void requestAttachments(attachments_vec_t& attachment_requests);
static void onIdle(void *);
@ -110,8 +110,8 @@ private:
LLItemRequestTimes(const std::string& op_name, F32 timeout);
void addTime(const LLUUID& inv_item_id);
void removeTime(const LLUUID& inv_item_id);
BOOL wasRequestedRecently(const LLUUID& item_id) const;
BOOL getTime(const LLUUID& inv_item_id, LLTimer& timer) const;
bool wasRequestedRecently(const LLUUID& item_id) const;
bool getTime(const LLUUID& inv_item_id, LLTimer& timer) const;
private:
F32 mTimeout;

20
indra/newview/llavataractions.cpp
View File

@ -680,7 +680,7 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_MessageBlock);
msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
msg->addBOOLFast(_PREHASH_FromGroup, false);
msg->addUUIDFast(_PREHASH_ToAgentID, notification["substitutions"]["uuid"] );
msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
msg->addU8Fast(_PREHASH_Dialog, IM_TELEPORT_REQUEST);
@ -927,7 +927,7 @@ namespace action_give_inventory
*/
static LLInventoryPanel* get_active_inventory_panel()
{
LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(false);
LLFloater* floater_appearance = LLFloaterReg::findInstance("appearance");
if (!active_panel || (floater_appearance && floater_appearance->hasFocus()))
{
@ -1302,8 +1302,8 @@ void LLAvatarActions::shareWithAvatars(LLView * panel)
LLInventoryPanel* inv_panel = dynamic_cast<LLInventoryPanel*>(panel);
LLFloaterAvatarPicker* picker =
// <FS:Ansariel> FIRE-32377: Don't include own avatar when sharing items
//LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2, inv_panel), TRUE, FALSE, FALSE, root_floater->getName());
LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2, inv_panel), TRUE, FALSE, TRUE, root_floater->getName());
//LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2, inv_panel), true, false, false, root_floater->getName());
LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2, inv_panel), true, false, true, root_floater->getName());
if (!picker)
{
return;
@ -1325,7 +1325,7 @@ void LLAvatarActions::shareWithAvatars(const uuid_set_t inventory_selected_uuids
using namespace action_give_inventory;
LLFloaterAvatarPicker* picker =
LLFloaterAvatarPicker::show(boost::bind(give_inventory_ids, _1, _2, inventory_selected_uuids), TRUE, FALSE, FALSE, root_floater->getName());
LLFloaterAvatarPicker::show(boost::bind(give_inventory_ids, _1, _2, inventory_selected_uuids), true, false, false, root_floater->getName());
if (!picker)
{
return;
@ -1548,7 +1548,7 @@ void LLAvatarActions::viewChatHistory(const LLUUID& id)
//LLFloaterReg::showInstance("preview_conversation", iter->getSessionID(), true);
if (gSavedSettings.getBOOL("FSUseBuiltInHistory"))
{
LLFloaterReg::showInstance("preview_conversation", iter->getSessionID(), TRUE);
LLFloaterReg::showInstance("preview_conversation", iter->getSessionID(), true);
}
else
{
@ -1581,7 +1581,7 @@ void LLAvatarActions::viewChatHistory(const LLUUID& id)
if (gSavedSettings.getBOOL("FSUseBuiltInHistory"))
{
LLFloaterReg::showInstance("preview_conversation", extended_id, TRUE);
LLFloaterReg::showInstance("preview_conversation", extended_id, true);
}
else
{
@ -1621,7 +1621,7 @@ void LLAvatarActions::viewChatHistoryExternally(const LLUUID& id)
//static
void LLAvatarActions::addToContactSet(const LLUUID& agent_id)
{
LLFloaterReg::showInstance("fs_add_contact", agent_id, TRUE);
LLFloaterReg::showInstance("fs_add_contact", agent_id, true);
}
void LLAvatarActions::addToContactSet(const uuid_vec_t& agent_ids)
@ -1637,7 +1637,7 @@ void LLAvatarActions::addToContactSet(const uuid_vec_t& agent_ids)
{
data.append(*it);
}
LLFloaterReg::showInstance("fs_add_contact", data, TRUE);
LLFloaterReg::showInstance("fs_add_contact", data, true);
}
}
// [/FS:CR] Add to contact set
@ -1661,7 +1661,7 @@ bool LLAvatarActions::handleRemove(const LLSD& notification, const LLSD& respons
case 0: // YES
if( ip->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS))
{
LLAvatarTracker::instance().empower(id, FALSE);
LLAvatarTracker::instance().empower(id, false);
LLAvatarTracker::instance().notifyObservers();
}
LLAvatarTracker::instance().terminateBuddy(id);

4
indra/newview/llavatarlist.cpp
View File

@ -363,7 +363,7 @@ void LLAvatarList::setDirty(bool val /*= true*/, bool force_refresh /*= false*/)
//////////////////////////////////////////////////////////////////////////
void LLAvatarList::refresh()
{
bool have_names = TRUE;
bool have_names = true;
bool add_limit_exceeded = false;
bool modified = false;
bool have_filter = !mNameFilter.empty();
@ -567,7 +567,7 @@ S32 LLAvatarList::notifyParent(const LLSD& info)
return LLFlatListViewEx::notifyParent(info);
}
void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos)
void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, bool is_online, EAddPosition pos)
{
LLAvatarListItem* item = new LLAvatarListItem();
item->setShowCompleteName(mShowCompleteName);

2
indra/newview/llavatarlist.h
View File

@ -129,7 +129,7 @@ public:
protected:
void refresh();
void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM);
void addNewItem(const LLUUID& id, const std::string& name, bool is_online, EAddPosition pos = ADD_BOTTOM);
void computeDifference(
const uuid_vec_t& vnew,
uuid_vec_t& vadded,

16
indra/newview/llavatarlistitem.cpp
View File

@ -151,11 +151,11 @@ bool LLAvatarListItem::postBuild()
mBtnPermissionEditMine->setClickedCallback(boost::bind(&LLAvatarListItem::onPermissionEditMineClick, this));
mBtnPermissionOnline->setVisible(false);
mBtnPermissionOnline->setIsChrome(TRUE);
mBtnPermissionOnline->setIsChrome(true);
mBtnPermissionMap->setVisible(false);
mBtnPermissionMap->setIsChrome(TRUE);
mBtnPermissionMap->setIsChrome(true);
mBtnPermissionEditMine->setVisible(false);
mBtnPermissionEditMine->setIsChrome(TRUE);
mBtnPermissionEditMine->setIsChrome(true);
mIconPermissionEditTheirs->setVisible(false);
mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
@ -462,7 +462,7 @@ void LLAvatarListItem::setShowProfileBtn(bool show)
void LLAvatarListItem::showSpeakingIndicator(bool visible)
{
// Already done? Then do nothing.
if (mSpeakingIndicator->getVisible() == (BOOL)visible)
if (mSpeakingIndicator->getVisible() == (bool)visible)
return;
// Disabled to not contradict with SpeakingIndicatorManager functionality. EXT-3976
// probably this method should be totally removed.
@ -473,7 +473,7 @@ void LLAvatarListItem::showSpeakingIndicator(bool visible)
void LLAvatarListItem::setAvatarIconVisible(bool visible)
{
// Already done? Then do nothing.
if (mAvatarIcon->getVisible() == (BOOL)visible)
if (mAvatarIcon->getVisible() == (bool)visible)
{
return;
}
@ -924,7 +924,7 @@ void LLAvatarListItem::onPermissionOnlineClick()
mBtnPermissionOnline->setColor(LLUIColorTable::instance().getColor("White_10"));
}
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(),new_rights);
mBtnPermissionOnline->setFocus(FALSE);
mBtnPermissionOnline->setFocus(false);
}
}
@ -946,7 +946,7 @@ void LLAvatarListItem::onPermissionMapClick()
mBtnPermissionMap->setColor(LLUIColorTable::instance().getColor("White_10"));
}
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(),new_rights);
mBtnPermissionMap->setFocus(FALSE);
mBtnPermissionMap->setFocus(false);
}
}
@ -969,7 +969,7 @@ void LLAvatarListItem::onPermissionEditMineClick()
LLAvatarPropertiesProcessor::getInstance()->sendFriendRights(getAvatarId(),new_rights);
}
mBtnPermissionEditMine->setFocus(FALSE);
mBtnPermissionEditMine->setFocus(false);
}
}

10
indra/newview/llavatarpropertiesprocessor.cpp
View File

@ -230,7 +230,7 @@ void LLAvatarPropertiesProcessor::sendAvatarPropertiesUpdate(const LLAvatarData*
// This value is required by sendAvatarPropertiesUpdate method.
//A profile should never be mature. (From the original code)
BOOL mature = FALSE;
bool mature = false;
LLMessageSystem *msg = gMessageSystem;
@ -284,10 +284,10 @@ std::string LLAvatarPropertiesProcessor::paymentInfo(const LLAvatarData* avatar_
const S32 LINDEN_EMPLOYEE_INDEX = 3;
if (avatar_data->caption_index == LINDEN_EMPLOYEE_INDEX) return "";
BOOL transacted = (avatar_data->flags & AVATAR_TRANSACTED);
BOOL identified = (avatar_data->flags & AVATAR_IDENTIFIED);
bool transacted = (avatar_data->flags & AVATAR_TRANSACTED);
bool identified = (avatar_data->flags & AVATAR_IDENTIFIED);
// Not currently getting set in dataserver/lldataavatar.cpp for privacy considerations
//BOOL age_verified = (avatar_data->flags & AVATAR_AGEVERIFIED);
//bool age_verified = (avatar_data->flags & AVATAR_AGEVERIFIED);
const char* payment_text;
if(transacted)
@ -768,7 +768,7 @@ void LLAvatarPropertiesProcessor::sendPickInfoUpdate(const LLPickData* new_pick)
msg->addUUID(_PREHASH_CreatorID, new_pick->creator_id);
//legacy var need to be deleted
msg->addBOOL(_PREHASH_TopPick, FALSE);
msg->addBOOL(_PREHASH_TopPick, false);
// fills in on simulator if null
msg->addUUID(_PREHASH_ParcelID, new_pick->parcel_id);

Some files were not shown because too many files have changed in this diff Show More