diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/newview/llfloaterdirectory.cpp | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/indra/newview/llfloaterdirectory.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterdirectory.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp index 305a029..9a0c2fc 100644 --- a/linden/indra/newview/llfloaterdirectory.cpp +++ b/linden/indra/newview/llfloaterdirectory.cpp | |||
| @@ -383,10 +383,6 @@ void LLFloaterDirectory::showPanel(const std::string& tabname) | |||
| 383 | // static | 383 | // static |
| 384 | void LLFloaterDirectory::toggleFind(void*) | 384 | void LLFloaterDirectory::toggleFind(void*) |
| 385 | { | 385 | { |
| 386 | #ifndef LL_RELEASE_FOR_DOWNLOAD | ||
| 387 | delete sInstance; | ||
| 388 | sInstance = NULL; | ||
| 389 | #endif | ||
| 390 | if (!sInstance) | 386 | if (!sInstance) |
| 391 | { | 387 | { |
| 392 | std::string panel = gSavedSettings.getString("LastFindPanel"); | 388 | std::string panel = gSavedSettings.getString("LastFindPanel"); |