diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/llpaneldirbrowser.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/llpaneldirbrowser.cpp')
| -rw-r--r-- | linden/indra/newview/llpaneldirbrowser.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp index b37d9fa..732a919 100644 --- a/linden/indra/newview/llpaneldirbrowser.cpp +++ b/linden/indra/newview/llpaneldirbrowser.cpp | |||
| @@ -985,8 +985,6 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**) | |||
| 985 | // So figure out the next button here, when we know how many aren't auctions | 985 | // So figure out the next button here, when we know how many aren't auctions |
| 986 | count = self->showNextButton(non_auction_count); | 986 | count = self->showNextButton(non_auction_count); |
| 987 | 987 | ||
| 988 | // Empty string will sort by current sort options. | ||
| 989 | list->sortByColumn(LLStringUtil::null,FALSE); | ||
| 990 | self->updateResultCount(); | 988 | self->updateResultCount(); |
| 991 | 989 | ||
| 992 | // Poke the result received timer | 990 | // Poke the result received timer |