summaryrefslogtreecommitdiff
path: root/indra/llcommon/lleventdispatcher.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-08-13 19:31:07 -0400
committerOz Linden <oz@lindenlab.com>2010-08-13 19:31:07 -0400
commit4ee6001c92ed42d2209f291ecd8049c5d184eb2c (patch)
treed4973f9e14cb63c700031af0a1ad33ac9c69d937 /indra/llcommon/lleventdispatcher.h
parent2d0e25a645ff5af3695e8c3e699940901f5cd09f (diff)
parent06b0d72efa96b6a0ed665f7cd46f358c48929e7b (diff)
Automated merge with file:///Users/oz/Internal/viewer-development
Diffstat (limited to 'indra/llcommon/lleventdispatcher.h')
-rw-r--r--indra/llcommon/lleventdispatcher.h21
1 files changed, 19 insertions, 2 deletions
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h
index 1e625bcee8..dfffd59eb6 100644
--- a/indra/llcommon/lleventdispatcher.h
+++ b/indra/llcommon/lleventdispatcher.h
@@ -7,8 +7,25 @@
* request different operations, vs. instantiating a different
* LLEventPump for each such operation.
*
- * $LicenseInfo:firstyear=2009&license=viewergpl$
- * Copyright (c) 2009, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2009&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$
*/