summaryrefslogtreecommitdiff
path: root/indra/newview/lldaycyclemanager.cpp
diff options
context:
space:
mode:
authornat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
committernat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
commit75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch)
tree33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/newview/lldaycyclemanager.cpp
parente59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/lldaycyclemanager.cpp')
-rwxr-xr-xindra/newview/lldaycyclemanager.cpp2
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;
}