diff options
| author | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-06-08 00:41:31 -0500 |
| commit | 0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llcommon/llfasttimer.h | |
| parent | Imprudence 1.1.0 released. (diff) | |
| parent | Updated Imprudence to be based on SL 1.22.11. (ChangeLog Entry) (diff) | |
| download | meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.zip meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.gz meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.bz2 meta-impy-0e5df9bdf8d6b418bb6e25615e2ffc922d0f02aa.tar.xz | |
Merge branch 'sl-base-1.22' into next
Conflicts:
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llcommon/llfasttimer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h index 8ad2667..a32da18 100644 --- a/linden/indra/llcommon/llfasttimer.h +++ b/linden/indra/llcommon/llfasttimer.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2004&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2004&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2004-2008, Linden Research, Inc. | 7 | * Copyright (c) 2004-2009, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -165,6 +165,7 @@ public: | |||
| 165 | FTM_FILTER, | 165 | FTM_FILTER, |
| 166 | FTM_REFRESH, | 166 | FTM_REFRESH, |
| 167 | FTM_SORT, | 167 | FTM_SORT, |
| 168 | FTM_PICK, | ||
| 168 | 169 | ||
| 169 | // Temp | 170 | // Temp |
| 170 | FTM_TEMP1, | 171 | FTM_TEMP1, |