diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-27 22:05:02 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-27 22:05:02 +0000 |
| commit | 76aa05e51fca9f3288c045083218245b0c84d1dd (patch) | |
| tree | c4f85cc530a5ae6277a5347bdfda31bc56fae9ef | |
| parent | 046e047b5c0031dd6a953a7fab677e085dd8d917 (diff) | |
| parent | 09ee906f23ded0b618b6afa8425f5984f48bd35b (diff) | |
Another sunshine-internal -> sunshine-experimental merge
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/llviewerwearable.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/autobuild.xml b/autobuild.xml index 0b79be64f7..4816310c38 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ <key>archive</key> <map> <key>hash</key> - <string>3f6d155b817f13577b96ff28160d5e12</string> + <string>acfd1513f234912ad20638fc4a467164</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/265243/arch/Linux/installer/llappearanceutility_source-0.1-linux-20120927.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/265247/arch/Linux/installer/llappearanceutility_source-0.1-linux-20120927.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index ce7c81ee6d..f6a03e708e 100755 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -477,6 +477,7 @@ void LLViewerWearable::revertValues() { LLWearable::revertValues(); + LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(LLFloaterSidePanelContainer::getPanel("appearance")); if( panel ) { |