diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-27 10:08:02 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-27 10:08:02 +0800 |
| commit | 06e8f0c443c1ba7858d000c6d695b7e988e02053 (patch) | |
| tree | bccd8f5b70e24934eff26cab934cd4ecf5864825 /indra/newview/llviewernetwork.cpp | |
| parent | 790e708ffc1cb138a484249b3ac7f240be21dd98 (diff) | |
| parent | 591ecf748a620f7528d498e576271a33df5366ee (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 16ddc2f89c..b8c9594aa7 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -629,6 +629,18 @@ bool LLGridManager::isInProductionGrid() return mIsInProductionGrid; } +bool LLGridManager::isInSecondlife() +{ + //return (isInSLMain() || isInSLBeta()); + return true; +} + +bool LLGridManager::isInOpenSim() +{ + // FIX THIS TO SUPPORT OPENSIM + return false; +} + bool LLGridManager::isSystemGrid(const std::string& grid) { std::string grid_name = getGrid(grid); |