Commit 52708727 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

Merge with SVN viewer-2.0.0-3 branch

parents a6ff5974 3e5819d8
......@@ -579,19 +579,23 @@ def get_build_cmd(self):
return ('"%sdevenv.com" %s.sln /build %s' %
(self.find_visual_studio(), self.project_name, self.build_type))
def run(self, command, name=None):
def run(self, command, name=None, retry_on=None, retries=1):
'''Run a program. If the program fails, raise an exception.'''
ret = os.system(command)
if ret:
if name is None:
name = command.split(None, 1)[0]
path = self.find_in_path(name)
if not path:
ret = 'was not found'
else:
ret = 'exited with status %d' % ret
raise CommandError('the command %r %s' %
(name, ret))
while retries:
retries = retries - 1
ret = os.system(command)
if ret:
if name is None:
name = command.split(None, 1)[0]
path = self.find_in_path(name)
if not path:
error = 'was not found'
else:
error = 'exited with status %d' % ret
if retry_on is not None and retry_on == ret:
print "Retrying... the command %r %s" % (name, error)
else:
raise CommandError('the command %r %s' % (name, error))
def run_cmake(self, args=[]):
'''Override to add the vstool.exe call after running cmake.'''
......@@ -629,11 +633,11 @@ def run_build(self, opts, targets):
for t in targets:
cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
print 'Running %r in %r' % (cmd, d)
self.run(cmd)
self.run(cmd, retry_on=4, retries=3)
else:
cmd = '%s %s' % (build_cmd, ' '.join(opts))
print 'Running %r in %r' % (cmd, d)
self.run(cmd)
self.run(cmd, retry_on=4, retries=3)
finally:
os.chdir(cwd)
......
......@@ -236,13 +236,13 @@ target_link_libraries(
include(LLAddBuildTest)
SET(llcommon_TEST_SOURCE_FILES
# WARNING: Please don't write tests against LLCommon or LLMath until this issue is resolved: https://jira.lindenlab.com/jira/browse/DEV-29456
# lllazy.cpp
)
LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
#set(TEST_DEBUG on)
set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
# Have to treat lllazy test as an integration test until this issue is resolved:
# https://jira.lindenlab.com/jira/browse/DEV-29456
LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}")
# *TODO - reenable these once tcmalloc libs no longer break the build.
......
......@@ -85,7 +85,8 @@ add_library (llmath ${llmath_SOURCE_FILES})
include(LLAddBuildTest)
SET(llmath_TEST_SOURCE_FILES
# WARNING: Please don't write tests against LLCommon or LLMath until this issue is resolved: https://jira.lindenlab.com/jira/browse/DEV-29456
# nat 2009-08-28: found this commented out and considered implementing it
# using LL_ADD_INTEGRATION_TEST, but there's no llvolume_test.cpp source?
# llvolume.cpp
)
LL_ADD_PROJECT_UNIT_TESTS(llmath "${llmath_TEST_SOURCE_FILES}")
......
......@@ -240,8 +240,4 @@ IF (NOT LINUX AND VIEWER)
)
LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}")
# Commented out - see rationale at bottom of newview's build file + poppy 2009-06-05
# Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage!
# ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py")
ENDIF (NOT LINUX AND VIEWER)
......@@ -551,7 +551,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
// This is a little bit kludgy. LLCacheNameCallback is a slot instead of a function pointer.
// The reason it is a slot is so that the legacy get() function below can bind an old callback
// and pass it as a slot. The reason it isn't a boost::function is so that trackable behavior
// deson't get lost. As a result, we have to bind the slot to a signal to call it, even when
// doesn't get lost. As a result, we have to bind the slot to a signal to call it, even when
// we call it immediately. -Steve
// NOTE: Even though passing first and last name is a bit of extra overhead, it eliminates the
// potential need for any parsing should any code need to handle first and last name independently.
......
......@@ -1511,11 +1511,6 @@ endif (INSTALL)
include(LLAddBuildTest)
SET(viewer_TEST_SOURCE_FILES
llagentaccess.cpp
# Not *actually* a unit test, it's an integration test.
# Because it won't work in the new unit test iface, i've commented out
# and notified Nat. Delete this when it's replaced!
# + poppy & brad 2009-06-05
# llcapabilitylistener.cpp
)
set_source_files_properties(
${viewer_TEST_SOURCE_FILES}
......@@ -1583,10 +1578,3 @@ if (WINDOWS)
)
endif (WINDOWS)
if (DARWIN)
# Don't do this here -- it's taken care of by viewer_manifest.py
# add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
# DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
# )
endif (DARWIN)
......@@ -23,6 +23,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>AgentPause</key>
<map>
<key>Comment</key>
<string>Ask the simulator to stop updating the agent while enabled</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>
......
da
\ No newline at end of file
es
\ No newline at end of file
version 19
version 20
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
......@@ -245,6 +245,7 @@ RenderVBOEnable 1 0
list Intel
RenderAnisotropic 1 0
RenderLightingDetail 1 0
RenderUseImpostors 0 0
list GeForce2
RenderAnisotropic 1 0
......
version 19
version 20
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
......
version 19
version 20
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
......
fr
\ No newline at end of file
hu
\ No newline at end of file
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
it
\ No newline at end of file
......@@ -55,7 +55,6 @@ class LLAppViewerMacOSX : public LLAppViewer
virtual void handleSyncCrashTrace();
std::string generateSerialNumber();
virtual bool initLogging();
virtual bool initParseCommandLine(LLCommandLineParser& clp);
};
......
......@@ -36,14 +36,12 @@
#include "lldrawpool.h"
class LLSkyTex;
class LLHeavenBody;
class LLGLSLShader;
class LLDrawPoolSky : public LLFacePool
{
private:
LLSkyTex *mSkyTex;
LLHeavenBody *mHB[2]; // Sun and Moon
LLGLSLShader *mShader;
public:
......@@ -69,8 +67,6 @@ class LLDrawPoolSky : public LLFacePool
/*virtual*/ void renderForSelect();
/*virtual*/ void endRenderPass(S32 pass);
void setSkyTex(LLSkyTex* const st) { mSkyTex = st; }
void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; }
void setMoon(LLHeavenBody* moon) { mHB[1] = moon; }
void renderSkyCubeFace(U8 side);
void renderHeavenlyBody(U8 hb, LLFace* face);
......
......@@ -470,6 +470,19 @@ bool handleVelocityInterpolate(const LLSD& newvalue)
return true;
}
bool toggle_agent_pause(const LLSD& newvalue)
{
if ( newvalue.asBoolean() )
{
send_agent_pause();
}
else
{
send_agent_resume();
}
return true;
}
////////////////////////////////////////////////////////////////////////////
void settings_setup_listeners()
......@@ -601,6 +614,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2));
gSavedSettings.getControl("QAMode")->getSignal()->connect(boost::bind(&show_debug_menus));
gSavedSettings.getControl("UseDebugMenus")->getSignal()->connect(boost::bind(&show_debug_menus));
gSavedSettings.getControl("AgentPause")->getSignal()->connect(boost::bind(&toggle_agent_pause, _2));
}
#if TEST_CACHED_CONTROL
......
nl
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment