Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 16ddc2f89c..f11fa09ce9 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -450,7 +450,7 @@ std::string LLGridManager::getGridLabel(const std::string& grid)
 {
     std::string grid_label;
     std::string grid_name = getGrid(grid);
-    if (!grid.empty())
+    if (!grid_name.empty())
     {
         grid_label = mGridList[grid_name][GRID_LABEL_VALUE].asString();
     }
@@ -466,7 +466,7 @@ std::string LLGridManager::getGridId(const std::string& grid)
 {
     std::string grid_id;
     std::string grid_name = getGrid(grid);
-    if (!grid.empty())
+    if (!grid_name.empty())
     {
         grid_id = mGridList[grid_name][GRID_ID_VALUE].asString();
     }