diff options
| author | Jacek Antonelli | 2009-09-27 16:32:32 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-27 16:32:32 -0500 |
| commit | 35e3870b5c9e38fdab96ca857a256be6d8ab024a (patch) | |
| tree | 02364fd85552dafbc2503e2c188b4c71e245e14f /linden/indra/newview/llappviewer.h | |
| parent | Re-enabled "allow first life" userauth stuff. (diff) | |
| parent | Changes to make the grid manager compile on Windows (diff) | |
| download | meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.zip meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.gz meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.bz2 meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/newview/llappviewer.h')
| -rw-r--r-- | linden/indra/newview/llappviewer.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h index 8d8e30f..66784f3 100644 --- a/linden/indra/newview/llappviewer.h +++ b/linden/indra/newview/llappviewer.h | |||
| @@ -224,6 +224,15 @@ private: | |||
| 224 | // for tracking viewer<->region circuit death | 224 | // for tracking viewer<->region circuit death |
| 225 | bool mAgentRegionLastAlive; | 225 | bool mAgentRegionLastAlive; |
| 226 | LLUUID mAgentRegionLastID; | 226 | LLUUID mAgentRegionLastID; |
| 227 | |||
| 228 | //public: | ||
| 229 | // //some information for updater | ||
| 230 | // typedef struct | ||
| 231 | // { | ||
| 232 | // std::string mUpdateExePath; | ||
| 233 | // std::ostringstream mParams; | ||
| 234 | // }LLUpdaterInfo ; | ||
| 235 | // static LLUpdaterInfo *sUpdaterInfo ; | ||
| 227 | }; | 236 | }; |
| 228 | 237 | ||
| 229 | // consts from viewer.h | 238 | // consts from viewer.h |