summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp8
-rw-r--r--indra/newview/llfloatermodelwizard.cpp9
-rw-r--r--indra/newview/llpanelobject.cpp4
-rw-r--r--indra/newview/llvovolume.cpp19
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_wizard.xml10
-rwxr-xr-xinstall.xml4
7 files changed, 38 insertions, 19 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index cf7ac354b6..42c93a91a5 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -603,13 +603,13 @@ void LLFloaterModelPreview::draw()
gGL.begin( LLRender::QUADS );
{
gGL.texCoord2f(0.f, 1.f);
- gGL.vertex2i(mPreviewRect.mLeft, mPreviewRect.mTop);
+ gGL.vertex2i(mPreviewRect.mLeft, mPreviewRect.mTop-1);
gGL.texCoord2f(0.f, 0.f);
gGL.vertex2i(mPreviewRect.mLeft, mPreviewRect.mBottom);
gGL.texCoord2f(1.f, 0.f);
- gGL.vertex2i(mPreviewRect.mRight, mPreviewRect.mBottom);
+ gGL.vertex2i(mPreviewRect.mRight-1, mPreviewRect.mBottom);
gGL.texCoord2f(1.f, 1.f);
- gGL.vertex2i(mPreviewRect.mRight, mPreviewRect.mTop);
+ gGL.vertex2i(mPreviewRect.mRight-1, mPreviewRect.mTop-1);
}
gGL.end();
@@ -3617,7 +3617,7 @@ BOOL LLModelPreview::render()
gGL.pushMatrix();
glLoadIdentity();
- gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);
+ gGL.color4f(0.169f, 0.169f, 0.169f, 1.f);
gl_rect_2d_simple( width, height );
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp
index 095499e6b0..be43216b0e 100644
--- a/indra/newview/llfloatermodelwizard.cpp
+++ b/indra/newview/llfloatermodelwizard.cpp
@@ -485,6 +485,7 @@ BOOL LLFloaterModelWizard::postBuild()
getChild<LLUICtrl>("back")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onClickBack, this));
getChild<LLUICtrl>("next")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onClickNext, this));
getChild<LLUICtrl>("preview_lod_combo")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPreviewLODCommit, this, _1));
+ getChild<LLUICtrl>("preview_lod_combo2")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPreviewLODCommit, this, _1));
getChild<LLUICtrl>("accuracy_slider")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onAccuracyPerformance, this, _2));
getChild<LLUICtrl>("upload")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onUpload, this));
getChild<LLUICtrl>("physics_slider")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPhysicsChanged, this));
@@ -630,17 +631,17 @@ void LLFloaterModelWizard::draw()
LLRect item_rect;
preview_panel->localRectToOtherView(preview_panel->getLocalRect(), &item_rect, this);
-
+
gGL.begin( LLRender::QUADS );
{
gGL.texCoord2f(0.f, 1.f);
- gGL.vertex2i(item_rect.mLeft, item_rect.mTop);
+ gGL.vertex2i(item_rect.mLeft, item_rect.mTop-1);
gGL.texCoord2f(0.f, 0.f);
gGL.vertex2i(item_rect.mLeft, item_rect.mBottom);
gGL.texCoord2f(1.f, 0.f);
- gGL.vertex2i(item_rect.mRight, item_rect.mBottom);
+ gGL.vertex2i(item_rect.mRight-1, item_rect.mBottom);
gGL.texCoord2f(1.f, 1.f);
- gGL.vertex2i(item_rect.mRight, item_rect.mTop);
+ gGL.vertex2i(item_rect.mRight-1, item_rect.mTop-1);
}
gGL.end();
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 42da966b92..0300ea0c92 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1178,13 +1178,13 @@ void LLPanelObject::getState( )
if (mCtrlSculptMirror)
{
mCtrlSculptMirror->set(sculpt_mirror);
- mCtrlSculptMirror->setEnabled(editable && (sculpt_stitching != LL_SCULPT_TYPE_MESH));
+ mCtrlSculptMirror->setEnabled(editable);
}
if (mCtrlSculptInvert)
{
mCtrlSculptInvert->set(sculpt_invert);
- mCtrlSculptInvert->setEnabled(editable && (!isMesh));
+ mCtrlSculptInvert->setEnabled(editable);
}
if (mLabelSculptType)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 5c1d10ba7d..e3cc2f2589 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1204,10 +1204,23 @@ BOOL LLVOVolume::calcLOD()
S32 cur_detail = 0;
- F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length();
- F32 distance = mDrawable->mDistanceWRTCamera; //llmin(mDrawable->mDistanceWRTCamera, MAX_LOD_DISTANCE);
- distance *= sDistanceFactor;
+ F32 radius;
+ F32 distance;
+
+ if (mDrawable->isState(LLDrawable::RIGGED))
+ {
+ LLVOAvatar* avatar = getAvatar();
+ distance = avatar->mDrawable->mDistanceWRTCamera;
+ radius = avatar->getBinRadius();
+ }
+ else
+ {
+ distance = mDrawable->mDistanceWRTCamera;
+ radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length();
+ }
+ distance *= sDistanceFactor;
+
F32 rampDist = LLVOVolume::sLODFactor * 2;
if (distance < rampDist)
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 201e971f4c..8a18861e1a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -58,6 +58,9 @@
<panel
name="preview_panel"
left="15"
+ bevel_style="none"
+ border_style="line"
+ border="true"
width="290"
height="290"
follows="all"/>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 2377a9e4ef..f133d75eee 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -101,7 +101,7 @@
height="388"
top_pad="0"
name="choose_file_panel"
- visible="false"
+ visible="true"
width="530"
left="0">
<panel
@@ -196,7 +196,7 @@
top_pad="0"
name="preview_panel"
bevel_style="none"
- border_style="line"
+ highlight_light_color="0.09 0.09 0.09 1"
border="true"
height="150"
follows="all"
@@ -395,7 +395,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
Model Preview:
</text>
<combo_box left_pad="5" top_delta="-2" follows="left|top" list_position="below" height="18"
- name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">
+ name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">
<combo_item name="high">
High
</combo_item>
@@ -414,6 +414,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
top_pad="5"
name="preview_panel"
bevel_style="none"
+ highlight_light_color="0.09 0.09 0.09 1"
border_style="line"
border="true"
height="175"
@@ -600,7 +601,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
height="388"
top_delta="0"
name="review_panel"
- visible="true"
+ visible="false"
width="530"
left="0">
<panel
@@ -670,6 +671,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
top_pad="10"
name="preview_panel"
bevel_style="none"
+ highlight_light_color="0.09 0.09 0.09 1"
border_style="line"
border="true"
height="190"
diff --git a/install.xml b/install.xml
index bcedf234c9..ed7ffd29b2 100755
--- a/install.xml
+++ b/install.xml
@@ -280,9 +280,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
- <string>041ac5d31331eb7358af71f7390f5dce</string>
+ <string>c1e79c9d3084727be35ce140db87717e</string>
<key>url</key>
- <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/colladadom-2.1-windows-20101119.tar.bz2</uri>
+ <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/colladadom-2.1-windows-20110223.tar.bz2</uri>
</map>
</map>
</map>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 10:33:04 +0000