Fix compilation errors for SL-only builds

indra/newview/lllocationinputctrl.cpp

@@ -70,11 +70,7 @@
 
 #include "llmenuoptionpathfindingrebakenavmesh.h"   // <FS:Zi> Pathfinding rebake functions
 #include "llfloaterreg.h"
-// <FS:CR> Don't show pathfinding icons in OpenSim
-#ifdef OPENSIM
-#include "llviewernetwork.h"
-#endif // OPENSIM
-// </FS:CR>
+#include "llviewernetwork.h" // <FS/> Access to GridManager
 #include "fsfloaterplacedetails.h"
 
 #include "llmenuoptionpathfindingrebakenavmesh.h"

indra/newview/llnavigationbar.cpp

@@ -732,10 +732,12 @@ void LLNavigationBar::onTeleportFinished(const LLVector3d& global_agent_pos)
     std::string grid = LLGridManager::getInstance()->getGrid();
     std::string current_grid = LFSimFeatureHandler::instance().hyperGridURL();
     LLSLURL slurl = LLSLURL(gAgent.getRegion()->getName(), gAgent.getRegion()->getOriginGlobal(), global_agent_pos);
+#ifdef OPENSIM
     if (!LLGridManager::getInstance()->isInSecondLife() && grid != current_grid)
     {
         slurl = LLSLURL(current_grid, gAgent.getRegion()->getName(), gAgent.getRegion()->getOriginGlobal(), global_agent_pos, true);
     }
+#endif
     std::string tooltip(slurl.getSLURLString());
     // </FS:Beq pp Oren>