diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 09:14:17 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 09:14:17 +0100 |
| commit | 302b3a07705730569c1eb692807c1050146d7941 (patch) | |
| tree | 3bb7b449d975562dd21d9045b92191460a87edc6 | |
| parent | ba64912c20ec1ff14bdbdec0ac1dabe81f306124 (diff) | |
| parent | b53ac25d5c9e04e8e1cabaa4fdf817248431fc72 (diff) | |
Merge http://bitbucket.org/aimee_linden/viewer-development-import
| -rw-r--r-- | doc/contributions.txt | 4 | ||||
| -rw-r--r-- | indra/llcommon/lleventtimer.h | 2 | ||||
| -rw-r--r-- | indra/newview/llnamelistctrl.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 16 |
5 files changed, 18 insertions, 8 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c8125c675f..f7dada053b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -518,6 +518,9 @@ Robin Cornelius SNOW-108 SNOW-204 SNOW-484 + SNOW-506 + SNOW-514 + SNOW-585 VWR-2488 VWR-9557 VWR-11128 @@ -616,6 +619,7 @@ Tharax Ferraris VWR-605 Thickbrick Sleaford SNOW-207 + SNOW-743 VWR-7109 VWR-9287 VWR-13483 diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h index 62586dd92f..7f42623d01 100644 --- a/indra/llcommon/lleventtimer.h +++ b/indra/llcommon/lleventtimer.h @@ -33,7 +33,7 @@ #include "lltimer.h" // class for scheduling a function to be called at a given frequency (approximate, inprecise) -class LL_COMMON_API LLEventTimer : protected LLInstanceTracker<LLEventTimer> +class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer> { public: LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 268d16976f..981e3df16b 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -33,7 +33,7 @@ class LLNameListCtrl -: public LLScrollListCtrl, protected LLInstanceTracker<LLNameListCtrl> +: public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl> { public: typedef enum e_name_type diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e1855a554b..2a6b272741 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2651,7 +2651,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) { LLVector3 pos, look_at; U64 region_handle; - U8 region_access; + U8 region_access = SIM_ACCESS_MIN; std::string region_info = ll_safe_string((char*)binary_bucket, binary_bucket_size); std::string region_access_str = LLStringUtil::null; std::string region_access_icn = LLStringUtil::null; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ecca003996..9885d1aa0d 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -316,8 +316,11 @@ class WindowsManifest(ViewerManifest): # For use in crash reporting (generates minidumps) self.path("dbghelp.dll") - # For using FMOD for sound... DJS - self.path("fmod.dll") + try: + # FMOD for sound + self.path("fmod.dll") + except: + print "Skipping FMOD - not found" self.enable_no_crt_manifest_check() @@ -643,8 +646,11 @@ class DarwinManifest(ViewerManifest): ): self.path(os.path.join(libdir, libfile), libfile) - #libfmodwrapper.dylib - self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") + try: + # FMOD for sound + self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") + except: + print "Skipping FMOD - not found" # our apps self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app") @@ -933,7 +939,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libfmod-3.75.so") pass except: - print "Skipping libkdu_v42R.so - not found" + print "Skipping libfmod-3.75.so - not found" pass self.end_prefix("lib") |