livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
Brad Payne (Vir Linden) 2012-12-12 15:33:39 -05:00
parent 507080795f 0b896a4953
commit 1701da7300
7 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autobuild.xml
View File

@ -30,9 +30,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c0c64dae149d0892343e2ff300fd06b9</string>
<string>176736c52b3cde6ca8e7d9e173d91731</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/232684/arch/Linux/installer/glod-1.0pre4-linux-20110611.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/268002/arch/Linux/installer/glod-1.0pre4-linux-20121212.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1453,7 +1453,7 @@
</map>
</map>
</map>
<key>mesa</key>
<key>mesa</key>
<map>
<key>license</key>
<string>mesa</string>

2
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -266,7 +266,7 @@ elseif(LINUX)
libdb-5.1.so
libexpat.so
libexpat.so.1
libglod.so
libGLOD.so
libgmock_main.so
libgmock.so.0
libgmodule-2.0.so

2
indra/cmake/GLOD.cmake
View File

@ -6,4 +6,4 @@ if (NOT STANDALONE)
endif (NOT STANDALONE)
set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
set(GLOD_LIBRARIES glod)
set(GLOD_LIBRARIES GLOD)

10
indra/newview/llpaneleditwearable.cpp
View File

@ -718,8 +718,8 @@ BOOL LLPanelEditWearable::postBuild()
mBtnBack = getChild<LLButton>("back_btn");
mBackBtnLabel = mBtnBack->getLabelUnselected();
mBtnBack->setLabel(LLStringUtil::null);
// handled at appearance panel level?
//mBtnBack->setClickedCallback(boost::bind(&LLPanelEditWearable::onBackButtonClicked, this));
mBtnBack->setClickedCallback(boost::bind(&LLPanelEditWearable::onBackButtonClicked, this));
mNameEditor = getChild<LLLineEditor>("description");
@ -872,6 +872,12 @@ void LLPanelEditWearable::setWearable(LLViewerWearable *wearable, BOOL disable_c
showWearable(mWearablePtr, TRUE, disable_camera_switch);
}
//static
void LLPanelEditWearable::onBackButtonClicked(void* userdata)
{
LLPanelEditWearable *panel = (LLPanelEditWearable*) userdata;
panel->saveChanges(true);
}
//static
void LLPanelEditWearable::onRevertButtonClicked(void* userdata)

1
indra/newview/llpaneleditwearable.h
View File

@ -70,6 +70,7 @@ public:
void updateScrollingPanelList();
static void onRevertButtonClicked(void* userdata);
static void onBackButtonClicked(void* userdata);
void onCommitSexChange();
void onSaveAsButtonClicked();
void saveAsCallback(const LLSD& notification, const LLSD& response);

5
indra/newview/llsidepanelappearance.cpp
View File

@ -232,6 +232,11 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility)
gAgentCamera.changeCameraToDefault();
gAgentCamera.resetView();
}
if ( mEditWearable->getVisible() )
{
mEditWearable->revertChanges();
}
}
}

2
indra/newview/viewer_manifest.py
View File

@ -1079,7 +1079,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libcrypto.so.*")
self.path("libexpat.so.*")
self.path("libssl.so.1.0.0")
self.path("libglod.so")
self.path("libGLOD.so")
self.path("libminizip.so")
self.path("libuuid.so*")
self.path("libSDL-1.2.so.*")