diff options
| author | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
|---|---|---|
| committer | Brett Joseph <bjoseph@vivox.com> | 2015-05-11 09:52:18 -0400 |
| commit | 43b7fe66db159faaa84d545f97818e7a6f0f6920 (patch) | |
| tree | 6581ed36e716f6aa57b01f2861d6812294fb2261 /indra/newview/lldaycyclemanager.cpp | |
| parent | 7cc3e9b3cf8d70fce2ba0d4a398824e599fc8c5d (diff) | |
| parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) | |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/lldaycyclemanager.cpp')
| -rwxr-xr-x | indra/newview/lldaycyclemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldaycyclemanager.cpp b/indra/newview/lldaycyclemanager.cpp index 131675310e..803e2b2fb2 100755 --- a/indra/newview/lldaycyclemanager.cpp +++ b/indra/newview/lldaycyclemanager.cpp @@ -207,7 +207,7 @@ bool LLDayCycleManager::addPreset(const std::string& name, const LLSD& data) { if (name.empty()) { - llassert(name.empty()); + //llassert(name.empty()); return false; } |