diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llpanelavatar.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index dc0db8b..f249d2a 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
| @@ -1321,11 +1321,11 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name | |||
| 1321 | { | 1321 | { |
| 1322 | if (avatar_id.isNull()) return; | 1322 | if (avatar_id.isNull()) return; |
| 1323 | 1323 | ||
| 1324 | BOOL avatar_changed = FALSE; | 1324 | // BOOL avatar_changed = FALSE; |
| 1325 | if (avatar_id != mAvatarID) | 1325 | // if (avatar_id != mAvatarID) |
| 1326 | { | 1326 | // { |
| 1327 | avatar_changed = TRUE; | 1327 | // avatar_changed = TRUE; |
| 1328 | } | 1328 | // } |
| 1329 | mAvatarID = avatar_id; | 1329 | mAvatarID = avatar_id; |
| 1330 | 1330 | ||
| 1331 | // Determine if we have their calling card. | 1331 | // Determine if we have their calling card. |