diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-01 17:00:42 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-01 17:00:42 -0600 |
| commit | 3083830d2105b420ba152e43018f3c88240bc310 (patch) | |
| tree | 8b43ea2076ea0136b1d64087581560a4b8bff33c /indra | |
| parent | 447e697e33bc6b0643524faa68614e087e936187 (diff) | |
| parent | 398b392dc06f10b643d9930ffc6fd50f611b570b (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/gpu_table.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelface.cpp | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index da888bc64d..bf604d6805 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -207,6 +207,7 @@ NVIDIA GTX 280 .*NVIDIA.*GeForce GTX 28.* 3 1 NVIDIA GTX 290 .*NVIDIA.*GeForce GTX 29.* 3 1 NVIDIA GTX 470 .*NVIDIA.*GeForce GTX 47.* 3 1 NVIDIA GTX 480 .*NVIDIA.*GeForce GTX 48.* 3 1 +NVIDIA GTX 580 .*NVIDIA.*GeForce GTX 58.* 3 1 NVIDIA C51 .*NVIDIA.*C51.* 0 1 NVIDIA G72 .*NVIDIA.*G72.* 1 1 NVIDIA G73 .*NVIDIA.*G73.* 1 1 diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index bce496cbad..07c7f35989 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -376,6 +376,11 @@ struct LLPanelFaceSetAlignedTEFunctor : public LLSelectedTEFunctor return true; } + if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te) + { + return true; + } + bool set_aligned = true; if (facep == mCenterFace) { @@ -418,6 +423,12 @@ struct LLPanelFaceGetIsAlignedTEFunctor : public LLSelectedTEFunctor { return false; } + + if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te) + { //volume face does not exist, can't be aligned + return false; + } + if (facep == mCenterFace) { return true; |