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

Fix Havok builds on platforms that enforce const correctness properly 

yep more whiny Linux and Mac shenanigans.
meow-7.2.2
Beq 2025-07-08 01:17:48 +01:00
parent 94cb22ad2a
commit 42b66b72fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewernetwork.cpp
View File

@ -434,7 +434,7 @@ void LLGridManager::setGridChoice(const std::string& grid)
}
}
std::string LLGridManager::getGrid( const std::string &grid )
std::string LLGridManager::getGrid( const std::string &grid ) const // <FS:Beq/> const correctness needed for Linux and MacOS
{
std::string grid_name;
@ -446,7 +446,7 @@ std::string LLGridManager::getGrid( const std::string &grid )
else
{
// search the grid list for a grid with a matching id
for(LLSD::map_iterator grid_iter = mGridList.beginMap();
for(auto grid_iter = mGridList.beginMap(); // <FS:Beq/> Let the compiler get the constness right
grid_name.empty() && grid_iter != mGridList.endMap();
grid_iter++)
{

4
indra/newview/llviewernetwork.h
View File

@ -95,7 +95,7 @@ class LLGridManager : public LLSingleton<LLGridManager>
* descriptive form (it is used in the login panel grid menu, for example).
*/
/// Return the name of a grid, given either its name or its id
std::string getGrid( const std::string &grid );
std::string getGrid( const std::string &grid ) const; // <FS:Beq/> const correctness needed for Linux and MacOS
/// Get the id (short form selector) for a given grid
std::string getGridId(const std::string& grid);
@ -201,7 +201,7 @@ class LLGridManager : public LLSingleton<LLGridManager>
void setGridChoice(const std::string& grid);
/// Returns the name of the currently selected grid
std::string getGrid() { return mGrid; }
std::string getGrid() const { return mGrid; }; // <FS:Beq/> const correctness needed for Linux and MacOS
//@}