diff options
| author | Armin Weatherwax | 2010-09-10 11:11:16 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 20:41:48 +0200 |
| commit | e596df5f4e84229f0c7edf02490197e3cef33f70 (patch) | |
| tree | 73b3c8fac6c1c91bff848dd12edf7d425282063e /linden | |
| parent | linux* kill imprudence gstreamer, use system gstreamer instead. (diff) | |
| download | meta-impy-e596df5f4e84229f0c7edf02490197e3cef33f70.zip meta-impy-e596df5f4e84229f0c7edf02490197e3cef33f70.tar.gz meta-impy-e596df5f4e84229f0c7edf02490197e3cef33f70.tar.bz2 meta-impy-e596df5f4e84229f0c7edf02490197e3cef33f70.tar.xz | |
fix conversion that is ambiguous for linux64 gcc; introduced in 11e4c300
maybe squash with 11e4c300
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llfloaterassetbrowser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterassetbrowser.cpp b/linden/indra/newview/llfloaterassetbrowser.cpp index 9b41390..ca0e8d1 100644 --- a/linden/indra/newview/llfloaterassetbrowser.cpp +++ b/linden/indra/newview/llfloaterassetbrowser.cpp | |||
| @@ -122,7 +122,7 @@ void LLFloaterAssetBrowser::createThumbnails() | |||
| 122 | temp.mUUID = itemp->getUUID(); | 122 | temp.mUUID = itemp->getUUID(); |
| 123 | temp.mName = itemp->getName(); | 123 | temp.mName = itemp->getName(); |
| 124 | temp.mTexturep = NULL; | 124 | temp.mTexturep = NULL; |
| 125 | temp.mAssetRect = NULL; | 125 | temp.mAssetRect = LLRect::null; |
| 126 | mTextureAssets.push_back(temp); | 126 | mTextureAssets.push_back(temp); |
| 127 | } | 127 | } |
| 128 | 128 | ||