Skip to content
Snippets Groups Projects
Commit 2587c4f2 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix build

parent d9d46ad9
No related branches found
No related tags found
No related merge requests found
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
#include "llviewernetwork.h" #include "llviewernetwork.h"
#include "llslurl.h" #include "llslurl.h"
#include "llnotificationsutil.h" #include "llnotificationsutil.h"
#include "llviewerbuildconfig.h"
#include <boost/regex.hpp> #include <boost/regex.hpp>
...@@ -2435,6 +2436,7 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features) ...@@ -2435,6 +2436,7 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
{ {
setGodnames(); setGodnames();
std::string cur_symbol = LLCurrencyWrapper::instance().getHomeCurrency(); std::string cur_symbol = LLCurrencyWrapper::instance().getHomeCurrency();
#if !LL_HAVOK
if (mSimulatorFeatures.has("OpenSimExtras")) if (mSimulatorFeatures.has("OpenSimExtras"))
{ {
const LLSD& extras(mSimulatorFeatures["OpenSimExtras"]); const LLSD& extras(mSimulatorFeatures["OpenSimExtras"]);
...@@ -2488,6 +2490,7 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features) ...@@ -2488,6 +2490,7 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
mMaxPhysPrimScale = extras.has("MaxPhysPrimScale") ? extras["MaxPhysPrimScale"].asReal() : OS_DEFAULT_MAX_PRIM_SCALE; mMaxPhysPrimScale = extras.has("MaxPhysPrimScale") ? extras["MaxPhysPrimScale"].asReal() : OS_DEFAULT_MAX_PRIM_SCALE;
} }
else else
#endif
{ {
mWhisperRange = 10; mWhisperRange = 10;
mSayRange = 20; mSayRange = 20;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment