diff options
| author | David Seikel | 2011-06-04 00:17:28 +1000 |
|---|---|---|
| committer | David Seikel | 2011-06-04 00:17:28 +1000 |
| commit | 492eaaf4eec82327116f2605e3d8becf94bec1b3 (patch) | |
| tree | dcddd674cb4861445c3ec5aaa59325b99a437614 /linden/indra/newview/llface.cpp | |
| parent | Set the real bare minimum prim size to 0.00001, as 0 sized objects cause bugs. (diff) | |
| parent | Fixing the menu to actually use its color options reveals how broken the whol... (diff) | |
| download | meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.zip meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.tar.gz meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.tar.bz2 meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.tar.xz | |
Merge branch 'next' of git://github.com/jacek/imprudence into next
Conflicts (manually merged):
linden/indra/llcommon/llversionviewer.h
linden/indra/llvfs/lldir.cpp
linden/indra/llvfs/lldir_mac.cpp
linden/indra/newview/CMakeLists.txt
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/Info-Imprudence.plist
linden/indra/newview/Info-meta-impy.plist
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/packaging/mac/Info.plist.in
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerversion.cpp
linden/indra/newview/viewerversion.h
linden/install.xml
Also some post merge tweaks.
Diffstat (limited to 'linden/indra/newview/llface.cpp')
| -rw-r--r-- | linden/indra/newview/llface.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp index aa8cd15..cf681fa 100644 --- a/linden/indra/newview/llface.cpp +++ b/linden/indra/newview/llface.cpp | |||
| @@ -159,6 +159,7 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp) | |||
| 159 | mIndicesIndex = 0; | 159 | mIndicesIndex = 0; |
| 160 | mTexture = NULL; | 160 | mTexture = NULL; |
| 161 | mTEOffset = -1; | 161 | mTEOffset = -1; |
| 162 | mIndexInTex = 0; | ||
| 162 | 163 | ||
| 163 | setDrawable(drawablep); | 164 | setDrawable(drawablep); |
| 164 | mVObjp = objp; | 165 | mVObjp = objp; |