diff options
| author | McGroarty <git@mcgroarty.me> | 2026-07-27 12:59:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-27 12:59:10 -0700 |
| commit | 21939024cdee694bf8e98b79c3ba929ffc2fef5e (patch) | |
| tree | 450fbbd27c07fdcc7236d1e782af0da7bb88a022 /indra/newview/llviewernetwork.cpp | |
| parent | d1796fba2500a30bd3c71b0588efd18c1a8625bf (diff) | |
| parent | 1c81813e79c4acc917d75b47117778dd277e5b1f (diff) | |
Merge pull request #1 from secondlife/develop
Fix UI issues, improve warnings, and enhance process handling
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 8ec2a6d661..fb52d0a8e6 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -135,7 +135,8 @@ void LLGridManager::initialize(const std::string& grid_file) LLSD other_grids; llifstream llsd_xml; - if (!grid_file.empty()) + // grids.xml is not supplied by default + if (!grid_file.empty() && LLFile::isfile(grid_file)) { LL_INFOS("GridManager")<<"Grid configuration file '"<<grid_file<<"'"<<LL_ENDL; llsd_xml.open( grid_file.c_str(), std::ios::in | std::ios::binary ); |