diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-01 12:56:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-01 12:56:50 -0500 |
| commit | e44c097aee27526869321a4ccd9b240cfbecabc0 (patch) | |
| tree | 144c667632a4ddb2a793dd1932ee5bc999a321f9 /indra/newview/llpanelface.cpp | |
| parent | 89816222d2de855204413700d023fb4102ed6307 (diff) | |
| parent | 2eaf35b946630ab6b8635e74d5e7f2188c179e4b (diff) | |
merge changes for ui fixes
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 5c4c2693f8..ca161a8654 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1368,10 +1368,10 @@ void LLPanelFace::updateMaterial() mMaterial.reset(); mMaterialID = LLMaterialID::null; // Delete existing material entry... - + LLSelectMgr::getInstance()->selectionRemoveMaterial(); // Hold off any further updates till this one's // acknowledged. - //mUpdateInFlight = true; + mUpdateInFlight = true; } } |