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

Merge remote-tracking branch 'singu/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2013-12-23 20:34:11 +01:00
parent 302bebd80f 4a2168cf48
commit a17eca6300
6 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/cmake/Boost.cmake
View File

@@ -38,26 +38,26 @@ else (STANDALONE)
debug libboost_thread-mt-gd)
elseif (LINUX)
set(Boost_CONTEXT_LIBRARY
optimized boost_context-mt.a
debug boost_context-mt-d.a)
optimized boost_context-mt
debug boost_context-mt-d)
set(Boost_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt.a
debug boost_filesystem-mt-d.a)
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(Boost_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt.a
debug boost_program_options-mt-d.a)
optimized boost_program_options-mt
debug boost_program_options-mt-d)
set(Boost_REGEX_LIBRARY
optimized boost_regex-mt.a
debug boost_regex-mt-d.a)
optimized boost_regex-mt
debug boost_regex-mt-d)
set(Boost_SIGNALS_LIBRARY
optimized boost_signals-mt.a
debug boost_signals-mt-d.a)
optimized boost_signals-mt
debug boost_signals-mt-d)
set(Boost_SYSTEM_LIBRARY
optimized boost_system-mt.a
debug boost_system-mt-d.a)
optimized boost_system-mt
debug boost_system-mt-d)
set(Boost_THREAD_LIBRARY
optimized boost_thread-mt.a
debug boost_thread-mt-d.a)
optimized boost_thread-mt
debug boost_thread-mt-d)
elseif (DARWIN)
set(Boost_CONTEXT_LIBRARY
optimized boost_context-mt

2
indra/newview/app_settings/settings.xml
View File

@@ -220,7 +220,7 @@
<integer>100</integer>
</map>
<key>zmm_mlfov</key>
<key>ExodusAlternativeFOV</key>
<map>
<key>Comment</key>
<string>Adjusted when scrolling back and forth while holding rightclick in mouselook (Zoomed in &lt; 1.037 &lt; Zoomed out)</string>

4
indra/newview/lltoolcomp.cpp
View File

@@ -824,7 +824,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
}
else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
mTargetFOV = gSavedSettings.getF32("zmm_mlfov");
mTargetFOV = gSavedSettings.getF32("ExodusAlternativeFOV");
mTimerFOV.start();
return TRUE;
@@ -837,7 +837,7 @@ BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
gSavedSettings.setF32(
"zmm_mlfov",
"ExodusAlternativeFOV",
mTargetFOV = clicks > 0 ?
llclamp(mTargetFOV += (0.05f * clicks), 0.1f, 3.0f) :
llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f)

15
indra/newview/llworldmap.cpp
View File

@@ -702,9 +702,12 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
case MAP_ITEM_LAND_FOR_SALE: // land for sale
case MAP_ITEM_LAND_FOR_SALE_ADULT: // adult land for sale
{
new_item.setTooltip(llformat("%d sq. m. %s%d", extra,
new_item.setTooltip(llformat("%d sq. m. %s%d (%.1f %s/sq. m.)", extra,
gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str(),
extra2));
extra2,
(extra > 0) ? ((F32)extra2 / extra) : 0.f,
gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str()));
if (type == MAP_ITEM_LAND_FOR_SALE)
{
siminfo->insertLandForSale(new_item);
@@ -712,11 +715,11 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
else if (type == MAP_ITEM_LAND_FOR_SALE_ADULT)
{
siminfo->insertLandForSaleAdult(new_item);
}
break;
}
case MAP_ITEM_CLASSIFIED: // classifieds
{
break;
}
case MAP_ITEM_CLASSIFIED: // classifieds
{
//DEPRECATED: no longer used
break;
}

18
indra/newview/viewer_manifest.py
View File

@@ -827,6 +827,15 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libtcmalloc_minimal.so.0")
self.path("libtcmalloc_minimal.so.0.2.2")
# Boost
self.path("libboost_context-mt.so.*")
self.path("libboost_filesystem-mt.so.*")
self.path("libboost_program_options-mt.so.*")
self.path("libboost_regex-mt.so.*")
self.path("libboost_signals-mt.so.*")
self.path("libboost_system-mt.so.*")
self.path("libboost_thread-mt.so.*")
if 'extra_libraries' in self.args:
path_list = self.args['extra_libraries'].split('|')
for path in path_list:
@@ -870,6 +879,15 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libpng*.so*")
self.path("libz.so*")
# Boost
self.path("libboost_context-mt.so.*")
self.path("libboost_filesystem-mt.so.*")
self.path("libboost_program_options-mt.so.*")
self.path("libboost_regex-mt.so.*")
self.path("libboost_signals-mt.so.*")
self.path("libboost_system-mt.so.*")
self.path("libboost_thread-mt.so.*")
# OpenAL
self.path("libopenal.so*")
self.path("libalut.so*")

8
install.xml
View File

@@ -256,16 +256,16 @@
<key>linux</key>
<map>
<key>md5sum</key>
<string>8817faad001cea8f92546f30b5fcbbfa</string>
<string>8a1017e1935ae3c88dea7f4552573f53</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux-20131007.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux-20131219.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>1d23d74f2f475945ec4d24f70a27561d</string>
<string>446dbefb0d3dd0bd93f30b4ef1eaa67b</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux64-20131007.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux64-20131219.tar.bz2</uri>
</map>
<key>windows</key>
<map>