diff options
| author | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
| commit | b5074f1a8e3306f1be9e93172d26c97ff088cea0 (patch) | |
| tree | a53d5cc54a1f339b7637a9d7d8248eca42995af2 /linden/indra/newview/llnamelistctrl.cpp | |
| parent | Revert "Fix Bug #671 (aka VWR-1603): Duckwalk is too fast" (diff) | |
| parent | Uploaded the linux64 libraries created by Aleric to imprudenceviewer.org (diff) | |
| download | meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.zip meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.gz meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.bz2 meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.xz | |
Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llnamelistctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp index 453cf7f..e445df5 100644 --- a/linden/indra/newview/llnamelistctrl.cpp +++ b/linden/indra/newview/llnamelistctrl.cpp | |||
| @@ -72,7 +72,7 @@ LLNameListCtrl::~LLNameListCtrl() | |||
| 72 | 72 | ||
| 73 | // public | 73 | // public |
| 74 | BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, | 74 | BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, |
| 75 | BOOL enabled, std::string& suffix) | 75 | BOOL enabled, const std::string& suffix) |
| 76 | { | 76 | { |
| 77 | //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl; | 77 | //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl; |
| 78 | 78 | ||