Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-09-01 10:08:29 -04:00
parent ea8791697e b4a7fa1ad9
commit 7b7157f491
10 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/cmake/Audio.cmake
View File

@@ -40,3 +40,11 @@ link_directories(
${VORBISFILE_LIBRARY_DIRS}
${OGG_LIBRARY_DIRS}
)
set(LLAUDIO_VORBIS_LIBRARIES
${VORBISENC_LIBRARIES}
${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES}
${OGG_LIBRARIES}
)

8
indra/llaudio/CMakeLists.txt
View File

@@ -111,10 +111,4 @@ list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
add_library (llaudio ${llaudio_SOURCE_FILES})
add_dependencies(llaudio prepare)
target_link_libraries(
llaudio
${VORBISENC_LIBRARIES}
${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES}
${OGG_LIBRARIES}
)

4
indra/llrender/llshadermgr.cpp
View File

@@ -717,8 +717,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
}
else if (major_version > 1 || minor_version >= 30)
{ //switches are supported in GLSL 1.30 and later
if (gGLManager.mIsNVIDIA)
{ //switches are unreliable on some NVIDIA drivers
if (gGLManager.mIsNVIDIA || (gGLManager.mIsATI && gGLManager.mGLVersion < 3.3f))
{ //switches are unreliable on old drivers
for (S32 i = 0; i < texture_index_channels; ++i)
{
std::string if_string = llformat("\t%sif (vary_texture_index == %d) { return texture2D(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i);

6
indra/llui/llmultifloater.cpp
View File

@@ -88,6 +88,7 @@ LLMultiFloater::LLMultiFloater(
{
mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
}
mTabContainer->setCommitCallback(boost::bind(&LLMultiFloater::onTabSelected, this));
addChild(mTabContainer);
}
@@ -114,6 +115,7 @@ LLMultiFloater::LLMultiFloater(
{
mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
}
mTabContainer->setCommitCallback(boost::bind(&LLMultiFloater::onTabSelected, this));
addChild(mTabContainer);
@@ -482,7 +484,7 @@ void LLMultiFloater::setCanResize(BOOL can_resize)
}
}
BOOL LLMultiFloater::postBuild()
/*BOOL LLMultiFloater::postBuild()
{
// remember any original xml minimum size
getResizeLimits(&mOrigMinWidth, &mOrigMinHeight);
@@ -501,7 +503,7 @@ BOOL LLMultiFloater::postBuild()
}
return FALSE;
}
}*/
void LLMultiFloater::updateResizeLimits()
{

1
indra/llui/llmultifloater.h
View File

@@ -45,7 +45,6 @@ public:
LLMultiFloater(const std::string& name, const std::string& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
virtual ~LLMultiFloater() {};
virtual BOOL postBuild();
virtual LLXMLNodePtr getXML(bool save_children = true) const;
/*virtual*/ void open(); /* Flawfinder: ignore */
/*virtual*/ void onClose(bool app_quitting);

1
indra/newview/CMakeLists.txt
View File

@@ -1540,6 +1540,7 @@ endif (WINDOWS)
target_link_libraries(${VIEWER_BINARY_NAME}
${GOOGLE_PERFTOOLS_LIBRARIES}
${LLAUDIO_LIBRARIES}
${LLAUDIO_VORBIS_LIBRARIES}
${LLCHARACTER_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLIMAGEJ2COJ_LIBRARIES}

19
indra/newview/app_settings/default_grids.xml
View File

@@ -2,7 +2,7 @@
<array>
<map>
<key>default_grids_version</key><string>20</string>
<key>default_grids_version</key><string>21</string>
</map>
<!-- Second Life -->
@@ -38,6 +38,23 @@
<key>auto_update</key><boolean>0</boolean>
</map>
<!-- OSGrid -->
<map>
<key>auto_update</key> <boolean>0</boolean>
<key>gridname</key> <string>OSGrid</string>
<key>gridnick</key> <string>osgrid</string>
<key>helperuri</key> <string>http://helper.osgrid.org/</string>
<key>inventory_links</key> <boolean>0</boolean>
<key>loginpage</key> <string>http://www.osgrid.org/splash/</string>
<key>loginuri</key> <string>http://login.osgrid.org/</string>
<key>password</key> <string>http://www.osgrid.org/</string>
<key>platform</key> <string>OpenSim</string>
<key>register</key> <string>http://www.osgrid.org/</string>
<key>render_compat</key> <boolean>1</boolean>
<key>search</key> <string />
<key>support</key> <string>http://www.osgrid.org/</string>
<key>website</key> <string>http://www.osgrid.org/</string>
</map>
<!-- Local Host -->
<map>

1
indra/newview/llpreview.cpp
View File

@@ -563,6 +563,7 @@ void LLMultiPreview::open() /*Flawfinder: ignore*/
{
frontmost_preview->loadAsset();
}
LLMultiFloater::postBuild();
}

4
indra/newview/llvovolume.cpp
View File

@@ -3510,8 +3510,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
continue;
}
if ((vobj->isMesh() &&
(vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled()))
if (vobj->isMesh() &&
((vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled()))
{
continue;
}

4
install.xml
View File

@@ -587,9 +587,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
<string>4f787437a5e063ccde6637dfb1ebc01d</string>
<string>82b85cce650e7409fc165bc730e2ad7a</string>
<key>url</key>
<uri>https://www.avination.com/viewerfiles/google_perftools-1.8-windows-20111005.tar.bz2</uri>
<uri>https://github.com/downloads/siana/SingularityViewer/gperftools-2.0-svn-windows-20120830.tar.bz2</uri>
</map>
</map>
</map>