diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llclickaction.h | 30 | ||||
| -rwxr-xr-x | indra/llcommon/llerror.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llstatenums.h | 31 | ||||
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 1 |
4 files changed, 61 insertions, 3 deletions
diff --git a/indra/llcommon/llclickaction.h b/indra/llcommon/llclickaction.h new file mode 100644 index 0000000000..2f83113af9 --- /dev/null +++ b/indra/llcommon/llclickaction.h @@ -0,0 +1,30 @@ +/** + * @file llclickaction.h + * @author James Cook + * @brief Constants for single-click actions on objects + * + * $LicenseInfo:firstyear=2006&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLCLICKACTION_H +#define LL_LLCLICKACTION_H +#endif diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 6da9df4dce..947aa11e94 100755 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -113,8 +113,6 @@ namespace { const std::string& message) { mFile << message << std::endl; - // mFile.flush(); - // *FIX: should we do this? } private: diff --git a/indra/llcommon/llstatenums.h b/indra/llcommon/llstatenums.h new file mode 100644 index 0000000000..6515a3e3cb --- /dev/null +++ b/indra/llcommon/llstatenums.h @@ -0,0 +1,31 @@ +/** + * @file llstatenums.h + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLSTATENUMS_H +#define LL_LLSTATENUMS_H + + + +#endif diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9c954e5a67..d544b992ef 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -93,7 +93,6 @@ #include "llvocache.h" #include "llvopartgroup.h" #include "llweb.h" -#include "llsecondlifeurls.h" #include "llupdaterservice.h" #include "llfloatertexturefetchdebugger.h" #include "llspellcheck.h" |