diff options
| author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
| commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llcommon/llfasttimer.h | |
| parent | 1.1 version final (diff) | |
| parent | Merge branch 'sl-base-1.22' into next (diff) | |
| download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz | |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/llcommon/llfasttimer.h')
| -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, |