diff options
| author | Jacek Antonelli | 2008-12-10 18:31:10 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-10 18:31:45 -0600 |
| commit | 38ce34139289dd2d90b42009c10505bd736b8cd2 (patch) | |
| tree | 26e71a5db9a9c1ab8d632cd5fbd1e6c879f5751c /linden/indra/newview/llfloaterdirectory.cpp | |
| parent | Updated audio engine to LL's openal branch r1532. (diff) | |
| parent | Added banners in ChangeLog to set versions apart. (diff) | |
| download | meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.zip meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.tar.gz meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.tar.bz2 meta-impy-38ce34139289dd2d90b42009c10505bd736b8cd2.tar.xz | |
Merge 1.0.0 RC2 into openal
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"); |