From 5d2167c66a027cc5e4e002dca51e163b0d08fe42 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Fri, 8 Jan 2010 15:10:59 -0800 Subject: Fix a typo bug caught by pyflakes. eys.exit(1) -> sys.exit(1) --- indra/develop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index eaecdd0ab6..9d606da1d9 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -504,7 +504,7 @@ class WindowsSetup(PlatformSetup): break else: print >> sys.stderr, 'Cannot find a Visual Studio installation!' - eys.exit(1) + sys.exit(1) return self._generator def _set_generator(self, gen): -- cgit v1.2.3 From 010bfed411cffdb7037872a209adf51c77f48140 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Fri, 8 Jan 2010 15:50:09 -0800 Subject: DEV-44838 - This is an attempt at the minimal possible change to fix the quoting bug on windows. This commit is untested! The simplest approach to testing is to push into a repo watched by parabuild. Also, develop.py could be improved to use subprocess consistently across all platforms. Doing so could simplify the code, but until I understand how to test it better, I'm going to leave it alone. --- indra/develop.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/indra/develop.py b/indra/develop.py index 9d606da1d9..27c3d0ca2c 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -41,6 +41,7 @@ import shutil import socket import sys import commands +import subprocess class CommandError(Exception): pass @@ -576,16 +577,20 @@ class WindowsSetup(PlatformSetup): return "buildconsole %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config} # devenv.com is CLI friendly, devenv.exe... not so much. - return ('"%sdevenv.com" %s.sln /build %s' % - (self.find_visual_studio(), self.project_name, self.build_type)) + executable = '%sdevenv.com' % (self.find_visual_studio(),) + cmd = ('"%s" %s.sln /build %s' % + (executable, self.project_name, self.build_type)) + return (executable, cmd) #return ('devenv.com %s.sln /build %s' % # (self.project_name, self.build_type)) def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' + assert name is not None, 'On windows an executable path must be given in name.' while retries: retries = retries - 1 print "develop.py tries to run:", command + ret = subprocess.call(command, executable=name) ret = os.system(command) print "got ret", ret, "from", command if ret: @@ -617,18 +622,19 @@ class WindowsSetup(PlatformSetup): if prev_build == self.build_type: # Only run vstool if the build type has changed. continue - vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + + executable = os.path.join('tools','vstool','VSTool.exe') + vstool_cmd = (executable + ' --solution ' + os.path.join(build_dir,'SecondLife.sln') + ' --config ' + self.build_type + ' --startup secondlife-bin') print 'Running %r in %r' % (vstool_cmd, getcwd()) - self.run(vstool_cmd) + self.run(vstool_cmd, name=executable) print >> open(stamp, 'w'), self.build_type def run_build(self, opts, targets): cwd = getcwd() - build_cmd = self.get_build_cmd() + executable, build_cmd = self.get_build_cmd() for d in self.build_dirs(): try: @@ -637,11 +643,11 @@ class WindowsSetup(PlatformSetup): for t in targets: cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts)) print 'Running %r in %r' % (cmd, d) - self.run(cmd, retry_on=4, retries=3) + self.run(cmd, name=executable, retry_on=4, retries=3) else: cmd = '%s %s' % (build_cmd, ' '.join(opts)) print 'Running %r in %r' % (cmd, d) - self.run(cmd, retry_on=4, retries=3) + self.run(cmd, name=executable, retry_on=4, retries=3) finally: os.chdir(cwd) -- cgit v1.2.3 From 6b33d5955a2c4ff34c17b58dd4a23b53a3c1dde7 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Fri, 8 Jan 2010 17:42:22 -0800 Subject: DEV-44838 - See if the executable parameter to subprocess.Popen must be absolute on windows. --- indra/develop.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/develop.py b/indra/develop.py index 27c3d0ca2c..dc1190699c 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -587,6 +587,8 @@ class WindowsSetup(PlatformSetup): def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' assert name is not None, 'On windows an executable path must be given in name.' + if not os.path.isfile(name): + name = self.find_in_path(name) while retries: retries = retries - 1 print "develop.py tries to run:", command -- cgit v1.2.3 From 61bc236b355e19bf09851b79c7d73b7210b4a7af Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Fri, 8 Jan 2010 17:58:56 -0800 Subject: DEV-44838 - Remove a typo line which would cause duplicate executions for every run call. --- indra/develop.py | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index dc1190699c..e19ecb7314 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -593,7 +593,6 @@ class WindowsSetup(PlatformSetup): retries = retries - 1 print "develop.py tries to run:", command ret = subprocess.call(command, executable=name) - ret = os.system(command) print "got ret", ret, "from", command if ret: if name is None: -- cgit v1.2.3 From 8246b382b732a9b49c49a012274cd17ce1af4e94 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Fri, 8 Jan 2010 18:00:32 -0800 Subject: DEV-44838 - find_in_path() returns a list of candidates. Select the first. --- indra/develop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index e19ecb7314..17ac1b3801 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -588,7 +588,7 @@ class WindowsSetup(PlatformSetup): '''Run a program. If the program fails, raise an exception.''' assert name is not None, 'On windows an executable path must be given in name.' if not os.path.isfile(name): - name = self.find_in_path(name) + name = self.find_in_path(name)[0] while retries: retries = retries - 1 print "develop.py tries to run:", command -- cgit v1.2.3 From f37f806660f66b064490b9c14d724273dc67fcbb Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Mon, 11 Jan 2010 10:38:13 -0800 Subject: DEV-44838 - Fix a bug introduced by inconsistently changing the get_build_cmd() interface. --- indra/develop.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/develop.py b/indra/develop.py index 17ac1b3801..a20badcfba 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -574,15 +574,15 @@ class WindowsSetup(PlatformSetup): if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]: config = '\"%s|Win32\"' % config - return "buildconsole %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config} + executable = self.find_in_path('buildconsole') + cmd = "%(bin)s %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config, 'bin': executable} + return (executable, cmd) # devenv.com is CLI friendly, devenv.exe... not so much. executable = '%sdevenv.com' % (self.find_visual_studio(),) cmd = ('"%s" %s.sln /build %s' % (executable, self.project_name, self.build_type)) return (executable, cmd) - #return ('devenv.com %s.sln /build %s' % - # (self.project_name, self.build_type)) def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' -- cgit v1.2.3 From 11eac588c2e26b42e269da9394bbb8918552fb1c Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Mon, 11 Jan 2010 10:45:01 -0800 Subject: DEV-44838 - Fix another bug introduced by passing "executable" in WindowsSetup.run(); find_in_path() does not handle absolute paths, but name is guaranteed to be an absolute path. This explains the bogus message in the log of the form "process $foo exited with nonzero status; process $foo is not found", described here: https://jira.lindenlab.com/jira/browse/DEV-44838?focusedCommentId=328441&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#action_328441 --- indra/develop.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/indra/develop.py b/indra/develop.py index a20badcfba..71569f15d2 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -595,10 +595,7 @@ class WindowsSetup(PlatformSetup): ret = subprocess.call(command, executable=name) print "got ret", ret, "from", command if ret: - if name is None: - name = command.split(None, 1)[0] - path = self.find_in_path(name) - if not path: + if not name: error = 'was not found' else: error = 'exited with status %d' % ret -- cgit v1.2.3 From 33df069238130a9e8c02a2aadcd41956780397db Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Mon, 11 Jan 2010 11:07:04 -0800 Subject: DEV-44838 - Fix a silly bug in yet another place: find_in_path returns a list, so select the first element. --- indra/develop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index 71569f15d2..897fbb6544 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -574,7 +574,7 @@ class WindowsSetup(PlatformSetup): if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]: config = '\"%s|Win32\"' % config - executable = self.find_in_path('buildconsole') + executable = self.find_in_path('buildconsole')[0] cmd = "%(bin)s %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config, 'bin': executable} return (executable, cmd) -- cgit v1.2.3 From 2d337ca8c6b05ecd7e8d4a8f0c3d88fabcc5bcbc Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Mon, 11 Jan 2010 12:30:27 -0800 Subject: DEV-44838 - See if buildconsole is confused by having the absolute path (with spaces) in the commandline. To accomplish this we put relative paths in the command string but lookup the absolute path for the executable parameter. --- indra/develop.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/develop.py b/indra/develop.py index 897fbb6544..b8fdd1a815 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -574,7 +574,7 @@ class WindowsSetup(PlatformSetup): if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]: config = '\"%s|Win32\"' % config - executable = self.find_in_path('buildconsole')[0] + executable = 'buildconsole' cmd = "%(bin)s %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config, 'bin': executable} return (executable, cmd) @@ -587,18 +587,17 @@ class WindowsSetup(PlatformSetup): def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' assert name is not None, 'On windows an executable path must be given in name.' - if not os.path.isfile(name): - name = self.find_in_path(name)[0] + if os.path.isfile(name): + path = name + else: + path = self.find_in_path(name)[0] while retries: retries = retries - 1 print "develop.py tries to run:", command - ret = subprocess.call(command, executable=name) + ret = subprocess.call(command, executable=path) print "got ret", ret, "from", command if ret: - if not name: - error = 'was not found' - else: - error = 'exited with status %d' % ret + 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: -- cgit v1.2.3 From dd7840aa9e0627430753522c4480212cf032463e Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Wed, 13 Jan 2010 15:47:57 -0800 Subject: Add an assertion for my sanity. --- indra/develop.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/develop.py b/indra/develop.py index b8fdd1a815..59722c4bc2 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -630,6 +630,8 @@ class WindowsSetup(PlatformSetup): print >> open(stamp, 'w'), self.build_type def run_build(self, opts, targets): + for t in targets: + assert t.strip(), 'Unexpected empty targets: ' + repr(targets) cwd = getcwd() executable, build_cmd = self.get_build_cmd() -- cgit v1.2.3 From bee98d70e3a8eca7f6f6f80d4ee6a14939771ae0 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Wed, 13 Jan 2010 16:08:30 -0800 Subject: DEV-44838 - Add the string "DEV-44838" to assertion failures to future devs understand preconditions on windows run(). --- indra/develop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index 59722c4bc2..a8a7b63aa7 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -586,7 +586,7 @@ class WindowsSetup(PlatformSetup): def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' - assert name is not None, 'On windows an executable path must be given in name.' + assert name is not None, 'On windows an executable path must be given in name. [DEV-44838]' if os.path.isfile(name): path = name else: -- cgit v1.2.3 From d194d95391f03b8a60c779f50f830df014e4b71e Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Wed, 13 Jan 2010 16:09:07 -0800 Subject: DEV-44838 - Fix a logic flaw in the windows run() retry code which would re-execute a process if its exit status was 0. --- indra/develop.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index a8a7b63aa7..0a2d3c5e52 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -596,7 +596,9 @@ class WindowsSetup(PlatformSetup): print "develop.py tries to run:", command ret = subprocess.call(command, executable=path) print "got ret", ret, "from", command - if ret: + if ret == 0: + break + 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) -- cgit v1.2.3 From 5fc9d8bddad16b7d8dc6d481107a8ce690fdf731 Mon Sep 17 00:00:00 2001 From: Nathan Wilcox Date: Wed, 20 Jan 2010 11:46:40 -0800 Subject: Remove a tab character from the end of a line to pass policy requirements. --- scripts/template_verifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py index d5fc119270..adcfcbcae6 100755 --- a/scripts/template_verifier.py +++ b/scripts/template_verifier.py @@ -103,7 +103,7 @@ MESSAGE_TEMPLATE = 'message_template.msg' PRODUCTION_ACCEPTABLE = (compatibility.Same, compatibility.Newer) DEVELOPMENT_ACCEPTABLE = ( compatibility.Same, compatibility.Newer, - compatibility.Older, compatibility.Mixed) + compatibility.Older, compatibility.Mixed) MAX_MASTER_AGE = 60 * 60 * 4 # refresh master cache every 4 hours -- cgit v1.2.3 From 683e7dc9c387297aed6b670fff1915af880562ae Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Thu, 28 Jan 2010 12:47:45 -0800 Subject: FIX EXT-4630 EXT-4670: Show inspector tooltip over media, don't show it if media is playing Review #91 This is a different take from my prior implementation. This has two changes to the "rules" for showing the inspector tooltip: 1. Do not show the inspector tooltip if hovering over a face that has media displaying 2. If you hover over a face with media *data* on it, show the inspector tooltip, subject to rule #1 (i.e. only if media is not displaying) --- indra/newview/lltoolpie.cpp | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 39e71974fd..bf1e307d71 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -910,16 +910,19 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l tooltip_msg.append( nodep->mName ); } + bool has_media = false; bool is_time_based_media = false; bool is_web_based_media = false; bool is_media_playing = false; + bool is_media_displaying = false; // Does this face have media? const LLTextureEntry* tep = hover_object->getTE(mHoverPick.mObjectFace); if(tep) { - const LLMediaEntry* mep = tep->hasMedia() ? tep->getMediaData() : NULL; + has_media = tep->hasMedia(); + const LLMediaEntry* mep = has_media ? tep->getMediaData() : NULL; if (mep) { viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()); @@ -927,33 +930,38 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l if (media_impl.notNull() && (media_impl->hasMedia())) { + is_media_displaying = true; LLStringUtil::format_map_t args; media_plugin = media_impl->getMediaPlugin(); if(media_plugin) - { if(media_plugin->pluginSupportsMediaTime()) - { - is_time_based_media = true; - is_web_based_media = false; - //args["[CurrentURL]"] = media_impl->getMediaURL(); - is_media_playing = media_impl->isMediaPlaying(); - } - else - { - is_time_based_media = false; - is_web_based_media = true; - //args["[CurrentURL]"] = media_plugin->getLocation(); - } + { + if(media_plugin->pluginSupportsMediaTime()) + { + is_time_based_media = true; + is_web_based_media = false; + //args["[CurrentURL]"] = media_impl->getMediaURL(); + is_media_playing = media_impl->isMediaPlaying(); + } + else + { + is_time_based_media = false; + is_web_based_media = true; + //args["[CurrentURL]"] = media_plugin->getLocation(); + } //tooltip_msg.append(LLTrans::getString("CurrentURL", args)); } } } } + // Avoid showing tip over media that's displaying // also check the primary node since sometimes it can have an action even though // the root node doesn't - bool needs_tip = needs_tooltip(nodep) || - needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()); + bool needs_tip = !is_media_displaying && + (has_media || + needs_tooltip(nodep) || + needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); if (show_all_object_tips || needs_tip) { -- cgit v1.2.3 From ec5dbb60e71302a77f68cc604e7dfd52bcaa926a Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 13:36:39 +0000 Subject: EXT-4763: Revert my previous fix. We don't want to universally disabled URL highlighting for all toast alerts, e.g., the report abuse notification has URLs that we want users to be able to click on. I have a better plan... --- indra/newview/lltoastalertpanel.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index da31bb3e73..c3ccb9380b 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -170,7 +170,6 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal params.tab_stop(false); params.wrap(true); params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP); - params.allow_html(false); LLTextBox * msg_box = LLUICtrlFactory::create (params); // Compute max allowable height for the dialog text, so we can allocate -- cgit v1.2.3 From 4d6c9e3e1754d21ea5291207085113e99456f571 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 14:30:26 +0000 Subject: EXT-4678: Support ... to turn off URL hyperlinking. We are running into a bunch of places where we don't want to allow hyperlinking of URLs like secondlife.com in text boxes. I've therefore added a new type of URL regex that disables URL hyperlinking. Simply enclose the URL in a tag, e.g.: secondlife.com --- indra/llui/lltextbase.cpp | 7 +++---- indra/llui/llurlentry.cpp | 24 +++++++++++++++++++++--- indra/llui/llurlentry.h | 14 ++++++++++++++ indra/llui/llurlmatch.cpp | 8 ++++++-- indra/llui/llurlmatch.h | 6 +++++- indra/llui/llurlregistry.cpp | 14 ++++++++++---- indra/llui/tests/llurlentry_test.cpp | 8 ++++++++ indra/llui/tests/llurlmatch_test.cpp | 30 +++++++++++++++--------------- 8 files changed, 82 insertions(+), 29 deletions(-) diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 8abbc833e5..2ee2023875 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1606,11 +1606,10 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c } } - // output the styled Url (unless we've been asked to suppress it) - if (isBlackListUrl(match.getUrl())) + // output the styled Url (unless we've been asked to suppress hyperlinking) + if (match.isLinkDisabled()) { - std::string orig_url = text.substr(start, end-start); - appendAndHighlightText(orig_url, prepend_newline, part, style_params); + appendAndHighlightText(match.getLabel(), prepend_newline, part, style_params); } else { diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 4927e57a52..58148ad2aa 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -39,8 +39,9 @@ #include "lltrans.h" #include "lluicolortable.h" -LLUrlEntryBase::LLUrlEntryBase() -: mColor(LLUIColorTable::instance().getColor("HTMLLinkColor")) +LLUrlEntryBase::LLUrlEntryBase() : + mColor(LLUIColorTable::instance().getColor("HTMLLinkColor")), + mDisabledLink(false) { } @@ -204,7 +205,7 @@ LLUrlEntryHTTPNoProtocol::LLUrlEntryHTTPNoProtocol() mPattern = boost::regex("(" "\\bwww\\.\\S+\\.\\S+" // i.e. www.FOO.BAR "|" // or - "(?]+\\.(?:com|net|edu|org)([/:][^[:space:]<]*)?\\b" // i.e. FOO.net ")", boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_http.xml"; @@ -641,3 +642,20 @@ std::string LLUrlEntryWorldMap::getLocation(const std::string &url) const // return the part of the Url after secondlife:///app/worldmap/ part return ::getStringAfterToken(url, "app/worldmap/"); } + +// +// LLUrlEntryNoLink lets us turn of URL detection with ... tags +// +LLUrlEntryNoLink::LLUrlEntryNoLink() +{ + mPattern = boost::regex("[^[:space:]<]+", + boost::regex::perl|boost::regex::icase); + mDisabledLink = true; +} + +std::string LLUrlEntryNoLink::getLabel(const std::string &url, const LLUrlLabelCallback &cb) +{ + // return the text between the and tags + return url.substr(8, url.size()-8-9); +} + diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 4adffde99c..94455ac247 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -91,6 +91,9 @@ public: /// Return the name of a SL location described by this Url, if any virtual std::string getLocation(const std::string &url) const { return ""; } + /// is this a match for a URL that should not be hyperlinked? + bool isLinkDisabled() const { return mDisabledLink; } + protected: std::string getIDStringFromUrl(const std::string &url) const; std::string escapeUrl(const std::string &url) const; @@ -111,6 +114,7 @@ protected: std::string mTooltip; LLUIColor mColor; std::multimap mObservers; + bool mDisabledLink; }; /// @@ -267,4 +271,14 @@ public: /*virtual*/ std::string getLocation(const std::string &url) const; }; +/// +/// LLUrlEntryNoLink lets us turn of URL detection with ... tags +/// +class LLUrlEntryNoLink : public LLUrlEntryBase +{ +public: + LLUrlEntryNoLink(); + /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); +}; + #endif diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp index 3b47145a22..72a199c220 100644 --- a/indra/llui/llurlmatch.cpp +++ b/indra/llui/llurlmatch.cpp @@ -41,14 +41,17 @@ LLUrlMatch::LLUrlMatch() : mLabel(""), mTooltip(""), mIcon(""), - mMenuName("") + mMenuName(""), + mLocation(""), + mDisabledLink(false) { } void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, const std::string &label, const std::string &tooltip, const std::string &icon, const LLUIColor& color, - const std::string &menu, const std::string &location) + const std::string &menu, const std::string &location, + bool disabled_link) { mStart = start; mEnd = end; @@ -59,4 +62,5 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url, mColor = color; mMenuName = menu; mLocation = location; + mDisabledLink = disabled_link; } diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h index 7f5767923a..e86762548b 100644 --- a/indra/llui/llurlmatch.h +++ b/indra/llui/llurlmatch.h @@ -83,11 +83,14 @@ public: /// return the SL location that this Url describes, or "" if none. std::string getLocation() const { return mLocation; } + /// is this a match for a URL that should not be hyperlinked? + bool isLinkDisabled() const { return mDisabledLink; } + /// Change the contents of this match object (used by LLUrlRegistry) void setValues(U32 start, U32 end, const std::string &url, const std::string &label, const std::string &tooltip, const std::string &icon, const LLUIColor& color, const std::string &menu, - const std::string &location); + const std::string &location, bool disabled_link); private: U32 mStart; @@ -99,6 +102,7 @@ private: std::string mMenuName; std::string mLocation; LLUIColor mColor; + bool mDisabledLink; }; #endif diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index ad5c0911f8..55eb8950e9 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -44,6 +44,7 @@ void LLUrlRegistryNullCallback(const std::string &url, const std::string &label) LLUrlRegistry::LLUrlRegistry() { // Urls are matched in the order that they were registered + registerUrl(new LLUrlEntryNoLink()); registerUrl(new LLUrlEntrySLURL()); registerUrl(new LLUrlEntryHTTP()); registerUrl(new LLUrlEntryHTTPLabel()); @@ -176,7 +177,8 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match_entry->getIcon(), match_entry->getColor(), match_entry->getMenuName(), - match_entry->getLocation(url)); + match_entry->getLocation(url), + match_entry->isLinkDisabled()); return true; } @@ -204,9 +206,13 @@ bool LLUrlRegistry::findUrl(const LLWString &text, LLUrlMatch &match, const LLUr S32 end = start + wurl.size() - 1; match.setValues(start, end, match.getUrl(), - match.getLabel(), match.getTooltip(), - match.getIcon(), match.getColor(), - match.getMenuName(), match.getLocation()); + match.getLabel(), + match.getTooltip(), + match.getIcon(), + match.getColor(), + match.getMenuName(), + match.getLocation(), + match.isLinkDisabled()); return true; } return false; diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 80be8fcbf7..6fec1d3e10 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -610,5 +610,13 @@ namespace tut testRegex("invalid .net URL", r, "foo.netty", ""); + + testRegex("XML tags around URL [1]", r, + "secondlife.com", + "secondlife.com"); + + testRegex("XML tags around URL [2]", r, + "secondlife.com/status?bar=1", + "secondlife.com/status?bar=1"); } } diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index e8cf135346..f9dfee931b 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -53,7 +53,7 @@ namespace tut LLUrlMatch match; ensure("empty()", match.empty()); - match.setValues(0, 1, "http://secondlife.com", "Second Life", "", "", LLUIColor(), "", ""); + match.setValues(0, 1, "http://secondlife.com", "Second Life", "", "", LLUIColor(), "", "", false); ensure("! empty()", ! match.empty()); } @@ -66,7 +66,7 @@ namespace tut LLUrlMatch match; ensure_equals("getStart() == 0", match.getStart(), 0); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure_equals("getStart() == 10", match.getStart(), 10); } @@ -79,7 +79,7 @@ namespace tut LLUrlMatch match; ensure_equals("getEnd() == 0", match.getEnd(), 0); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure_equals("getEnd() == 20", match.getEnd(), 20); } @@ -92,10 +92,10 @@ namespace tut LLUrlMatch match; ensure_equals("getUrl() == ''", match.getUrl(), ""); - match.setValues(10, 20, "http://slurl.com/", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "http://slurl.com/", "", "", "", LLUIColor(), "", "", false); ensure_equals("getUrl() == 'http://slurl.com/'", match.getUrl(), "http://slurl.com/"); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure_equals("getUrl() == '' (2)", match.getUrl(), ""); } @@ -108,10 +108,10 @@ namespace tut LLUrlMatch match; ensure_equals("getLabel() == ''", match.getLabel(), ""); - match.setValues(10, 20, "", "Label", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "Label", "", "", LLUIColor(), "", "", false); ensure_equals("getLabel() == 'Label'", match.getLabel(), "Label"); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure_equals("getLabel() == '' (2)", match.getLabel(), ""); } @@ -124,10 +124,10 @@ namespace tut LLUrlMatch match; ensure_equals("getTooltip() == ''", match.getTooltip(), ""); - match.setValues(10, 20, "", "", "Info", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "Info", "", LLUIColor(), "", "", false); ensure_equals("getTooltip() == 'Info'", match.getTooltip(), "Info"); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure_equals("getTooltip() == '' (2)", match.getTooltip(), ""); } @@ -140,10 +140,10 @@ namespace tut LLUrlMatch match; ensure_equals("getIcon() == ''", match.getIcon(), ""); - match.setValues(10, 20, "", "", "", "Icon", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "Icon", LLUIColor(), "", "", false); ensure_equals("getIcon() == 'Icon'", match.getIcon(), "Icon"); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure_equals("getIcon() == '' (2)", match.getIcon(), ""); } @@ -156,10 +156,10 @@ namespace tut LLUrlMatch match; ensure("getMenuName() empty", match.getMenuName().empty()); - match.setValues(10, 20, "", "", "", "Icon", LLUIColor(), "xui_file.xml", ""); + match.setValues(10, 20, "", "", "", "Icon", LLUIColor(), "xui_file.xml", "", false); ensure_equals("getMenuName() == \"xui_file.xml\"", match.getMenuName(), "xui_file.xml"); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure("getMenuName() empty (2)", match.getMenuName().empty()); } @@ -172,10 +172,10 @@ namespace tut LLUrlMatch match; ensure("getLocation() empty", match.getLocation().empty()); - match.setValues(10, 20, "", "", "", "Icon", LLUIColor(), "xui_file.xml", "Paris"); + match.setValues(10, 20, "", "", "", "Icon", LLUIColor(), "xui_file.xml", "Paris", false); ensure_equals("getLocation() == \"Paris\"", match.getLocation(), "Paris"); - match.setValues(10, 20, "", "", "", "", LLUIColor(), "", ""); + match.setValues(10, 20, "", "", "", "", LLUIColor(), "", "", false); ensure("getLocation() empty (2)", match.getLocation().empty()); } } -- cgit v1.2.3 From 2ec69d6d71e18c60a81d55f79e291e366d05eacd Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 14:56:39 +0000 Subject: EXT-4678: Revert URL black list support from LLTextBase. The new URL provides a more flexible solution that can be specified in XUI (as we now do to disabled hyperlinking for the sim hostname in the About floater). --- indra/llui/lltextbase.cpp | 19 ------------------- indra/llui/lltextbase.h | 7 ------- indra/newview/llfloaterabout.cpp | 6 ------ indra/newview/skins/default/xui/en/floater_about.xml | 2 +- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 2ee2023875..978bd317e2 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1512,25 +1512,6 @@ void LLTextBase::setText(const LLStringExplicit &utf8str, const LLStyle::Params& onValueChange(0, getLength()); } -void LLTextBase::addBlackListUrl(const std::string &url) -{ - mBlackListUrls.push_back(url); -} - -bool LLTextBase::isBlackListUrl(const std::string &url) const -{ - std::vector::const_iterator it; - for (it = mBlackListUrls.begin(); it != mBlackListUrls.end(); ++it) - { - const std::string &blacklist_url = *it; - if (url.find(blacklist_url) != std::string::npos) - { - return true; - } - } - return false; -} - //virtual std::string LLTextBase::getText() const { diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index e1c6cc36ab..dc3671eab1 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -187,9 +187,6 @@ public: const LLFontGL* getDefaultFont() const { return mDefaultFont; } LLStyle::Params getDefaultStyle(); - // tell the text object to suppress auto highlighting of a specific URL - void addBlackListUrl(const std::string &url); - public: // Fired when a URL link is clicked commit_signal_t mURLClickSignal; @@ -312,7 +309,6 @@ protected: void updateRects(); void needsScroll() { mScrollNeeded = TRUE; } void replaceUrlLabel(const std::string &url, const std::string &label); - bool isBlackListUrl(const std::string &url) const; protected: // text segmentation and flow @@ -364,9 +360,6 @@ protected: LLView* mDocumentView; class LLScrollContainer* mScroller; - // list of URLs to suppress from automatic hyperlinking - std::vector mBlackListUrls; - // transient state bool mReflowNeeded; // need to reflow text because of change to text contents or display region bool mScrollNeeded; // need to change scroll region because of change to cursor position diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 04f4ddf996..ef69f39ad2 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -187,12 +187,6 @@ BOOL LLFloaterAbout::postBuild() support << '\n' << getString("AboutTraffic", args); } - // don't make the sim hostname be a hyperlink - if (info.has("HOSTNAME")) - { - support_widget->addBlackListUrl(info["HOSTNAME"].asString()); - } - support_widget->appendText(support.str(), FALSE, LLStyle::Params() diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index b6443c4c21..bfdd48e2f4 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -21,7 +21,7 @@ Built with [COMPILER] version [COMPILER_VERSION] -You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at [HOSTNAME] ([HOSTIP]) +You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] -- cgit v1.2.3 From 303c379a18630fbbc2c4a86714ebd9627c03ec9e Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 29 Jan 2010 14:57:41 +0000 Subject: EXT-4763: Use syntax to disable linking of landmark names. --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fc535205f1..d3e08cad3a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3088,7 +3088,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport to [LOCATION]? +Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? Date: Fri, 29 Jan 2010 17:34:44 +0000 Subject: EXT-4493: Mark snapshot as dirty when changing quality slider. --- indra/newview/llfloatersnapshot.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 94c7ff6f94..a0031f0193 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -378,6 +378,7 @@ void LLSnapshotLivePreview::setSnapshotQuality(S32 quality) { mSnapshotQuality = quality; gSavedSettings.setS32("SnapshotQuality", quality); + mSnapshotUpToDate = FALSE; } } -- cgit v1.2.3 From 1b5880a18ef82d79d8c60bcf2745baf80f3fa571 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 10:46:48 -0800 Subject: notifiaction_id -> notification_id ouch. --- indra/newview/llimfloater.cpp | 4 ++-- indra/newview/llnotificationhandlerutil.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index c2bcb1cdf9..9e52d4c6c2 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -604,9 +604,9 @@ void LLIMFloater::updateMessages() chat.mTimeStr = time; // process offer notification - if (msg.has("notifiaction_id")) + if (msg.has("notification_id")) { - chat.mNotifId = msg["notifiaction_id"].asUUID(); + chat.mNotifId = msg["notification_id"].asUUID(); } //process text message else diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index f9b3b7187a..16218f6d53 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -248,7 +248,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) llassert_always(session != NULL); LLSD offer; - offer["notifiaction_id"] = notification->getID(); + offer["notification_id"] = notification->getID(); offer["from_id"] = notification->getPayload()["from_id"]; offer["from"] = name; offer["time"] = LLLogChat::timestamp(true); -- cgit v1.2.3 From fab60b8c05a89498bd8efeafdea8acfa5f94f06c Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 11:08:04 -0800 Subject: requred -> required --- indra/newview/llfavoritesbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 57e6619470..f5bb777419 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -780,8 +780,8 @@ LLButton* LLFavoritesBarCtrl::createButton(const LLPointergetWidth(item->getName()) + 20; - int width = requred_width > def_button_width? def_button_width : requred_width; + int required_width = mFont->getWidth(item->getName()) + 20; + int width = required_width > def_button_width? def_button_width : required_width; LLFavoriteLandmarkButton* fav_btn = NULL; // do we have a place for next button + double buttonHGap + mChevronButton ? -- cgit v1.2.3 From b3a0419493c9d3fcea4ca5ba89fdd311feccfec6 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:07:36 -0800 Subject: CID-350 Checker: UNINIT_CTOR Function: LLDrawPoolAvatar::LLDrawPoolAvatar() File: /indra/newview/lldrawpoolavatar.cpp not a bug, just a dead member... --- indra/newview/lldrawpoolavatar.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index 6a2b7fc218..b947943619 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -39,8 +39,6 @@ class LLVOAvatar; class LLDrawPoolAvatar : public LLFacePool { -protected: - S32 mNumFaces; public: enum { -- cgit v1.2.3 From 9c55d91f786eff48a27bf960e1f48f5369532e66 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:11:09 -0800 Subject: CID-349 Checker: UNINIT_CTOR Function: LLDrawPoolWater::LLDrawPoolWater() File: /indra/newview/lldrawpoolwater.cpp just another dead member. --- indra/newview/lldrawpoolwater.h | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 68a8172dd0..614f645243 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -47,7 +47,6 @@ protected: LLPointer mWaterImagep; LLPointer mWaterNormp; - const LLWaterSurface *mWaterSurface; public: static BOOL sSkipScreenCopy; static BOOL sNeedsReflectionUpdate; -- cgit v1.2.3 From d74aff7869d45f3061026766bfbd2db942645ac9 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:13:37 -0800 Subject: CID-347 Checker: UNINIT_CTOR Function: LLDrawPoolSky::LLDrawPoolSky() File: /indra/newview/lldrawpoolsky.cpp --- indra/newview/lldrawpoolsky.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index 8428be194f..0f76165053 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -48,8 +48,11 @@ #include "pipeline.h" #include "llviewershadermgr.h" -LLDrawPoolSky::LLDrawPoolSky() : - LLFacePool(POOL_SKY), mShader(NULL) +LLDrawPoolSky::LLDrawPoolSky() +: LLFacePool(POOL_SKY), + + mSkyTex(NULL), + mShader(NULL) { } @@ -132,6 +135,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side) return; } + llassert(mSkyTex); mSkyTex[side].bindTexture(TRUE); face.renderIndexed(); -- cgit v1.2.3 From b05ca33c4aa350d342dee6b03d1481fce0924a53 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:16:02 -0800 Subject: CID-346 Checker: UNINIT_CTOR Function: LLFeatureManager::LLFeatureManager() File: /indra/newview/llfeaturemanager.h --- indra/newview/llfeaturemanager.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 383963a41d..dd218d428f 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -99,8 +99,14 @@ protected: class LLFeatureManager : public LLFeatureList, public LLSingleton { public: - LLFeatureManager() : - LLFeatureList("default"), mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN) + LLFeatureManager() + : LLFeatureList("default"), + + mInited(FALSE), + mTableVersion(0), + mSafe(FALSE), + mGPUClass(GPU_CLASS_UNKNOWN), + mGPUSupported(FALSE) { } ~LLFeatureManager() {cleanupFeatureTables();} -- cgit v1.2.3 From 5c01eca7dd9e14753829ed251735cfc89be25cb7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:18:29 -0800 Subject: CID-345 Checker: UNINIT_CTOR Function: LLConsole::LLConsole(const LLConsole::Params &) File: /indra/llui/llconsole.cpp --- indra/llui/llconsole.cpp | 4 +++- indra/llui/llconsole.h | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 59499f987b..0237c80efa 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -66,7 +66,9 @@ LLConsole::LLConsole(const LLConsole::Params& p) : LLUICtrl(p), LLFixedBuffer(p.max_lines), mLinePersistTime(p.persist_time), // seconds - mFont(p.font) + mFont(p.font), + mConsoleWidth(0), + mConsoleHeight(0) { if (p.font_size_index.isProvided()) { diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h index 5800a82922..4719950f28 100644 --- a/indra/llui/llconsole.h +++ b/indra/llui/llconsole.h @@ -150,8 +150,6 @@ private: F32 mLinePersistTime; // Age at which to stop drawing. F32 mFadeTime; // Age at which to start fading const LLFontGL* mFont; - S32 mLastBoxHeight; - S32 mLastBoxWidth; S32 mConsoleWidth; S32 mConsoleHeight; -- cgit v1.2.3 From df657d7488014b9fa008da6a5f4307a19fee855e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:21:08 -0800 Subject: CID-344 Checker: UNINIT_CTOR Function: LLDockControl::LLDockControl(LLView *, LLFloater *, const LLPointer &, LLDockControl::DocAt, boost::function &)>) File: /indra/llui/lldockcontrol.cpp --- indra/llui/lldockcontrol.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index 0d8e54aa48..d836a5f4cd 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -37,7 +37,11 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater, const LLUIImagePtr& dockTongue, DocAt dockAt, get_allowed_rect_callback_t get_allowed_rect_callback) : - mDockWidget(dockWidget), mDockableFloater(dockableFloater), mDockTongue(dockTongue) + mDockWidget(dockWidget), + mDockableFloater(dockableFloater), + mDockTongue(dockTongue), + mDockTongueX(0), + mDockTongueY(0) { mDockAt = dockAt; -- cgit v1.2.3 From 32d66e60fddb26d0736149e16b1b57f7aa186146 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:36:58 -0800 Subject: CID-342 Checker: UNINIT_CTOR Function: LLNotification::LLNotification(LLUUID) File: /indra/llui/llnotifications.h 'don't use this for anything real' code shouldn't exist. :) --- indra/llui/llnotifications.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index aeb4cebf1b..44ff7894ac 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -369,10 +369,6 @@ private: LLNotification(const Params& p); - // this is just for making it easy to look things up in a set organized by UUID -- DON'T USE IT - // for anything real! - LLNotification(LLUUID uuid) : mId(uuid) {} - void cancel(); bool payloadContainsAll(const std::vector& required_fields) const; -- cgit v1.2.3 From a07e40e70db8c9a4b90ff114c2bdca5a4ee6da83 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:53:20 -0800 Subject: CID-341 Checker: UNINIT_CTOR Function: LLNotificationComparators::orderBy::orderBy(boost::function)>, LLNotificationComparators::e_direction) File: /indra/llui/llnotifications.h --- indra/llui/llnotifications.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 44ff7894ac..7269e43325 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -617,7 +617,7 @@ namespace LLNotificationComparators struct orderBy { typedef boost::function field_t; - orderBy(field_t field, EDirection = ORDER_INCREASING) : mField(field) {} + orderBy(field_t field, EDirection direction = ORDER_INCREASING) : mField(field), mDirection(direction) {} bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) { if (mDirection == ORDER_DECREASING) -- cgit v1.2.3 From 5bf17543c2f920509ff2ffe713f4fff6ae10bdae Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 13:59:54 -0800 Subject: Backed out changeset 298497c8090c Gosh, I don't know why this unused ctor actually matters, but it does. o.O --- indra/llui/llnotifications.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 44ff7894ac..aeb4cebf1b 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -369,6 +369,10 @@ private: LLNotification(const Params& p); + // this is just for making it easy to look things up in a set organized by UUID -- DON'T USE IT + // for anything real! + LLNotification(LLUUID uuid) : mId(uuid) {} + void cancel(); bool payloadContainsAll(const std::vector& required_fields) const; -- cgit v1.2.3 From 93b35ad444bea4257b2bd80029e3d01acec1f497 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:02:59 -0800 Subject: CID-342 alternative fix Checker: UNINIT_CTOR Function: LLNotification::LLNotification(LLUUID) File: /indra/llui/llnotifications.h --- indra/llui/llnotifications.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index cf76d00dcf..d55e0f4043 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -371,7 +371,7 @@ private: // this is just for making it easy to look things up in a set organized by UUID -- DON'T USE IT // for anything real! - LLNotification(LLUUID uuid) : mId(uuid) {} + LLNotification(LLUUID uuid) : mId(uuid), mCancelled(false), mRespondedTo(false), mIgnored(false), mTemporaryResponder(false) {} void cancel(); -- cgit v1.2.3 From 97e59b20f0a7bed7119496c0848ccefa79cac5e1 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:10:29 -0800 Subject: CID-340 Checker: UNINIT_CTOR Function: LLNotificationTemplate::LLNotificationTemplate() File: /indra/llui/llnotifications.cpp --- indra/llui/llnotifications.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index a67094b8ce..035ca3f26b 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -384,7 +384,8 @@ LLNotificationTemplate::LLNotificationTemplate() : mExpireSeconds(0), mExpireOption(-1), mURLOption(-1), - mURLOpenExternally(-1), + mURLOpenExternally(-1), + mPersist(false), mUnique(false), mPriority(NOTIFICATION_PRIORITY_NORMAL) { -- cgit v1.2.3 From abd24efbf1182596db19e27ee4e9cacb28a4a9d7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:19:19 -0800 Subject: CID-337 Checker: UNINIT_CTOR Function: Translation::Translation() File: /indra/llcharacter/llbvhloader.h --- indra/llcharacter/llbvhloader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h index 85ab035e61..38617bd6d4 100644 --- a/indra/llcharacter/llbvhloader.h +++ b/indra/llcharacter/llbvhloader.h @@ -166,6 +166,7 @@ public: Translation() { mIgnore = FALSE; + mIgnorePositions = FALSE; mRelativePositionKey = FALSE; mRelativeRotationKey = FALSE; mPriorityModifier = 0; -- cgit v1.2.3 From 47a7262713b9576304546f5ab139d2ca67c6c8e7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:29:28 -0800 Subject: CID-335 Checker: UNINIT_CTOR Function: LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &) File: /indra/llcharacter/llkeyframewalkmotion.cpp --- indra/llcharacter/llkeyframewalkmotion.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp index b5817e5bde..d18f924b55 100644 --- a/indra/llcharacter/llkeyframewalkmotion.cpp +++ b/indra/llcharacter/llkeyframewalkmotion.cpp @@ -58,11 +58,15 @@ const F32 MAX_ROLL = 0.6f; // LLKeyframeWalkMotion() // Class Constructor //----------------------------------------------------------------------------- -LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &id) : LLKeyframeMotion(id) +LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &id) + : LLKeyframeMotion(id), + + mCharacter(NULL), + mCyclePhase(0.0f), + mRealTimeLast(0.0f), + mAdjTimeLast(0.0f), + mDownFoot(0.0f) { - mRealTimeLast = 0.0f; - mAdjTimeLast = 0.0f; - mCharacter = NULL; } -- cgit v1.2.3 From 6f364cf7c5a0dc01e8bab4818b4762d258b62a90 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:30:22 -0800 Subject: CID-335 follow-up --- indra/llcharacter/llkeyframewalkmotion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp index d18f924b55..461309bee9 100644 --- a/indra/llcharacter/llkeyframewalkmotion.cpp +++ b/indra/llcharacter/llkeyframewalkmotion.cpp @@ -65,7 +65,7 @@ LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &id) mCyclePhase(0.0f), mRealTimeLast(0.0f), mAdjTimeLast(0.0f), - mDownFoot(0.0f) + mDownFoot(0) { } -- cgit v1.2.3 From 8e45dfe2c6ffff26417d7c43120e1f4a23ba3cac Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:31:39 -0800 Subject: CID-334 Checker: UNINIT_CTOR Function: LLStateMachine::LLStateMachine() File: /indra/llcharacter/llstatemachine.cpp --- indra/llcharacter/llstatemachine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp index 73c6951211..f4eb59b0f2 100644 --- a/indra/llcharacter/llstatemachine.cpp +++ b/indra/llcharacter/llstatemachine.cpp @@ -305,6 +305,7 @@ LLStateMachine::LLStateMachine() // we haven't received a starting state yet mCurrentState = NULL; mLastState = NULL; + mLastTransition = NULL; mStateDiagram = NULL; } -- cgit v1.2.3 From 0faac6bd1492575dc1f82c916cd9a8a8d6bdb797 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:32:35 -0800 Subject: CID-333 Checker: UNINIT_CTOR Function: LLStateDiagram::LLStateDiagram() File: /indra/llcharacter/llstatemachine.cpp --- indra/llcharacter/llstatemachine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp index f4eb59b0f2..e6fa4d7985 100644 --- a/indra/llcharacter/llstatemachine.cpp +++ b/indra/llcharacter/llstatemachine.cpp @@ -54,6 +54,7 @@ bool operator!=(const LLUniqueID &a, const LLUniqueID &b) //----------------------------------------------------------------------------- LLStateDiagram::LLStateDiagram() { + mDefaultState = NULL; mUseDefaultState = FALSE; } -- cgit v1.2.3 From 73e62c0cb59f1234545b9aa96914426849c376f0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:34:21 -0800 Subject: CID-332 Checker: UNINIT_CTOR Function: LLNotecard::LLNotecard(int) File: /indra/llinventory/llnotecard.cpp --- indra/llinventory/llnotecard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp index 9e7e043761..f6e41eecb4 100644 --- a/indra/llinventory/llnotecard.cpp +++ b/indra/llinventory/llnotecard.cpp @@ -35,7 +35,9 @@ #include "llstreamtools.h" LLNotecard::LLNotecard(S32 max_text) -: mMaxText(max_text) + : mMaxText(max_text), + mVersion(0), + mEmbeddedVersion(0) { } -- cgit v1.2.3 From 138c1fa86dea9ab3e96feae2bae1c757c39d50ea Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:37:18 -0800 Subject: CID-330 Checker: UNINIT_CTOR Function: LLMaterialTable::LLMaterialTable() File: /indra/llprimitive/llmaterialtable.cpp --- indra/llprimitive/llmaterialtable.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp index 18787c47c5..774a58c8ac 100644 --- a/indra/llprimitive/llmaterialtable.cpp +++ b/indra/llprimitive/llmaterialtable.cpp @@ -92,6 +92,9 @@ F32 const LLMaterialTable::DEFAULT_FRICTION = 0.5f; F32 const LLMaterialTable::DEFAULT_RESTITUTION = 0.4f; LLMaterialTable::LLMaterialTable() + : mCollisionSoundMatrix(NULL), + mSlidingSoundMatrix(NULL), + mRollingSoundMatrix(NULL) { } -- cgit v1.2.3 From f83ca2abd654ac632a869a7c010fbcb18120ee9f Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:41:39 -0800 Subject: CID-329 Checker: UNINIT_CTOR Function: LLMaterialInfo::LLMaterialInfo(unsigned char, const std::basic_string, std::allocator>&, const LLUUID &) File: /indra/llprimitive/llmaterialtable.h --- indra/llprimitive/llmaterialtable.h | 83 ++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/indra/llprimitive/llmaterialtable.h b/indra/llprimitive/llmaterialtable.h index 2c0b046fa7..77f29a8e06 100644 --- a/indra/llprimitive/llmaterialtable.h +++ b/indra/llprimitive/llmaterialtable.h @@ -38,6 +38,8 @@ #include +class LLMaterialInfo; + const U32 LLMATERIAL_INFO_NAME_LENGTH = 256; // We've moved toward more reasonable mass values for the Havok4 engine. @@ -64,45 +66,6 @@ const F32 LEGACY_DEFAULT_OBJECT_DENSITY = 10.0f; const F32 DEFAULT_AVATAR_DENSITY = 445.3f; // was 444.24f; -class LLMaterialInfo -{ -public: - U8 mMCode; - std::string mName; - LLUUID mDefaultTextureID; - LLUUID mShatterSoundID; - F32 mDensity; // kg/m^3 - F32 mFriction; - F32 mRestitution; - - // damage and energy constants - F32 mHPModifier; // modifier on mass based HP total - F32 mDamageModifier; // modifier on KE based damage - F32 mEPModifier; // modifier on mass based EP total - - LLMaterialInfo(U8 mcode, const std::string& name, const LLUUID &uuid) - { - init(mcode,name,uuid); - }; - - void init(U8 mcode, const std::string& name, const LLUUID &uuid) - { - mDensity = 1000.f; // default to 1000.0 (water) - mHPModifier = 1.f; - mDamageModifier = 1.f; - mEPModifier = 1.f; - - mMCode = mcode; - mName = name; - mDefaultTextureID = uuid; - }; - - ~LLMaterialInfo() - { - }; - -}; - class LLMaterialTable { public: @@ -185,5 +148,47 @@ public: static LLMaterialTable basic; }; + +class LLMaterialInfo +{ +public: + U8 mMCode; + std::string mName; + LLUUID mDefaultTextureID; + LLUUID mShatterSoundID; + F32 mDensity; // kg/m^3 + F32 mFriction; + F32 mRestitution; + + // damage and energy constants + F32 mHPModifier; // modifier on mass based HP total + F32 mDamageModifier; // modifier on KE based damage + F32 mEPModifier; // modifier on mass based EP total + + LLMaterialInfo(U8 mcode, const std::string& name, const LLUUID &uuid) + { + init(mcode,name,uuid); + }; + + void init(U8 mcode, const std::string& name, const LLUUID &uuid) + { + mDensity = 1000.f; // default to 1000.0 (water) + mFriction = LLMaterialTable::DEFAULT_FRICTION; + mRestitution = LLMaterialTable::DEFAULT_RESTITUTION; + mHPModifier = 1.f; + mDamageModifier = 1.f; + mEPModifier = 1.f; + + mMCode = mcode; + mName = name; + mDefaultTextureID = uuid; + }; + + ~LLMaterialInfo() + { + }; + +}; + #endif -- cgit v1.2.3 From d477b83325822989e0c4ad70fbee3797937215b7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:43:46 -0800 Subject: CID-328 Checker: UNINIT_CTOR Function: LLAgent::LLAgent() File: /indra/newview/tests/llviewerhelputil_test.cpp --- indra/newview/tests/llviewerhelputil_test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index 297d98ad8d..dd61ac6ae5 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -87,8 +87,6 @@ public: __attribute__ ((noinline)) #endif BOOL isGodlike() const { return FALSE; } -private: - int dummy; }; LLAgent gAgent; -- cgit v1.2.3 From 68401771cd3ee60727e561a9576bda63a4e66637 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:53:16 -0800 Subject: CID-325 Checker: UNINIT_CTOR Function: LLNotificationForm::LLNotificationForm(const LLSD &) File: /indra/llui/llnotifications.cpp --- indra/llui/llnotifications.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 035ca3f26b..5816cef6af 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -283,6 +283,7 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLXMLNodeP } LLNotificationForm::LLNotificationForm(const LLSD& sd) + : mIgnore(IGNORE_NO) { if (sd.isArray()) { -- cgit v1.2.3 From efe4ed283be8ac0861c38ebffc2637cd9293f267 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:54:57 -0800 Subject: CID-322 Checker: UNINIT_CTOR Function: LLInitParam::BaseBlock::BaseBlock() File: /indra/llxuixml/llinitparam.cpp --- indra/llxuixml/llinitparam.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 4c050844f8..d908c85da6 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -85,7 +85,8 @@ namespace LLInitParam // BaseBlock::BaseBlock() : mLastChangedParam(0), - mChangeVersion(0) + mChangeVersion(0), + mBlockDescriptor(NULL) {} BaseBlock::~BaseBlock() -- cgit v1.2.3 From 8f39cd1bc929c517e49055e69fc14a99e9158bc8 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:56:29 -0800 Subject: CID-321 Checker: UNINIT_CTOR Function: LLInitParam::ParamDescriptor::ParamDescriptor(...) --- indra/llxuixml/llinitparam.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 7e1e4a3d21..bdc6d146e6 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -321,13 +321,13 @@ namespace LLInitParam typedef bool(*validation_func_t)(const Param*); ParamDescriptor(param_handle_t p, - merge_func_t merge_func, - deserialize_func_t deserialize_func, - serialize_func_t serialize_func, - validation_func_t validation_func, - inspect_func_t inspect_func, - S32 min_count, - S32 max_count) + merge_func_t merge_func, + deserialize_func_t deserialize_func, + serialize_func_t serialize_func, + validation_func_t validation_func, + inspect_func_t inspect_func, + S32 min_count, + S32 max_count) : mParamHandle(p), mMergeFunc(merge_func), mDeserializeFunc(deserialize_func), @@ -336,6 +336,7 @@ namespace LLInitParam mInspectFunc(inspect_func), mMinCount(min_count), mMaxCount(max_count), + mGeneration(0), mNumRefs(0) {} -- cgit v1.2.3 From a8dd137a8de5915477ddc65cf1d5a508c85b745d Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 14:58:13 -0800 Subject: CID-320 Checker: UNINIT_CTOR Function: LLInitParam::BlockDescriptor::BlockDescriptor() File: /indra/llxuixml/llinitparam.h --- indra/llxuixml/llinitparam.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index bdc6d146e6..a84e47f998 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -372,7 +372,8 @@ namespace LLInitParam public: BlockDescriptor() : mMaxParamOffset(0), - mInitializationState(UNINITIALIZED) + mInitializationState(UNINITIALIZED), + mCurrentBlockPtr(NULL) {} typedef enum e_initialization_state -- cgit v1.2.3 From fd5af776d91cb102c49dcdfef24935bf8280349c Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:00:29 -0800 Subject: CID-319 Checker: UNINIT_CTOR Function: LLViewerLogin::LLViewerLogin() File: /indra/newview/tests/lllogininstance_test.cpp --- indra/newview/tests/lllogininstance_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 7b28a3b72c..f7ac5361c5 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -56,9 +56,9 @@ void LLLogin::disconnect() //----------------------------------------------------------------------------- #include "../llviewernetwork.h" -unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {'1','2','3','4','5','6'}; /* Flawfinder: ignore */ +unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {'1','2','3','4','5','6'}; -LLViewerLogin::LLViewerLogin() {} +LLViewerLogin::LLViewerLogin() : mGridChoice(GRID_INFO_NONE) {} LLViewerLogin::~LLViewerLogin() {} void LLViewerLogin::getLoginURIs(std::vector& uris) const { -- cgit v1.2.3 From ee82ed694c85330d88712e92ee5d28685144f680 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:02:32 -0800 Subject: CID-317 Checker: UNINIT_CTOR Function: LLCacheNameEntry::LLCacheNameEntry() File: /indra/llmessage/llcachename.cpp --- indra/llmessage/llcachename.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index dbec2816c8..9363b3a8d5 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -81,6 +81,8 @@ public: }; LLCacheNameEntry::LLCacheNameEntry() + : mIsGroup(false), + mCreateTime(0) { } -- cgit v1.2.3 From 86d07360f6eb58dda55c3673c863b8c9701b3d32 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:09:19 -0800 Subject: CID-316 Checker: UNINIT_CTOR Function: LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *, const LLUUID &, LLAssetType::EType, LLAssetStorage::ERequestType, const std::basic_string, std::allocator>&, void *) File: /indra/llmessage/llhttpassetstorage.cpp --- indra/llmessage/llhttpassetstorage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp index 49dbdbd56d..1980735bbb 100644 --- a/indra/llmessage/llhttpassetstorage.cpp +++ b/indra/llmessage/llhttpassetstorage.cpp @@ -126,8 +126,9 @@ LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const std::string& url, CURLM *curl_multi) : LLAssetRequest(uuid, type), - mZInitialized(false) + mZInitialized(false) { + memset(&mZStream, 0, sizeof(mZStream)); // we'll initialize this later, but for now zero the whole C-style struct to avoid debug/coverity noise mAssetStoragep = asp; mCurlHandle = NULL; mCurlMultiHandle = curl_multi; -- cgit v1.2.3 From 3064b556ef56ffceda2c11217ac635ee18559751 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:11:32 -0800 Subject: CID-315 Checker: UNINIT_CTOR Function: LLIMInfo::LLIMInfo() File: /indra/llmessage/llinstantmessage.cpp --- indra/llmessage/llinstantmessage.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llmessage/llinstantmessage.cpp b/indra/llmessage/llinstantmessage.cpp index 3da41939fa..a9e1ee77ef 100644 --- a/indra/llmessage/llinstantmessage.cpp +++ b/indra/llmessage/llinstantmessage.cpp @@ -68,9 +68,11 @@ const S32 IM_TTL = 1; * LLIMInfo */ LLIMInfo::LLIMInfo() : + mFromGroup(FALSE), mParentEstateID(0), mOffline(0), mViewerThinksToIsOnline(false), + mIMType(IM_NOTHING_SPECIAL), mTimeStamp(0), mSource(IM_FROM_SIM), mTTL(IM_TTL) -- cgit v1.2.3 From c99025f68f5a1433488b67915070056055f325fe Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:13:06 -0800 Subject: CID-314 Checker: UNINIT_CTOR Function: LLHTTPResponseHeader::LLHTTPResponseHeader() File: /indra/llmessage/lliohttpserver.cpp --- indra/llmessage/lliohttpserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 97134bd336..3b1ff414bc 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -403,7 +403,7 @@ void LLHTTPPipe::unlockChain() class LLHTTPResponseHeader : public LLIOPipe { public: - LLHTTPResponseHeader() {} + LLHTTPResponseHeader() : mCode(0) {} virtual ~LLHTTPResponseHeader() {} protected: -- cgit v1.2.3 From 54cc8274b07a66f412115aae92b18428670889eb Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:14:33 -0800 Subject: CID-313 Checker: UNINIT_CTOR Function: LLHTTPPipe::LLHTTPPipe(const LLHTTPNode &) File: /indra/llmessage/lliohttpserver.cpp --- indra/llmessage/lliohttpserver.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 3b1ff414bc..d6b672ef5c 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -74,7 +74,12 @@ class LLHTTPPipe : public LLIOPipe { public: LLHTTPPipe(const LLHTTPNode& node) - : mNode(node), mResponse(NULL), mState(STATE_INVOKE), mChainLock(0), mStatusCode(0) + : mNode(node), + mResponse(NULL), + mState(STATE_INVOKE), + mChainLock(0), + mLockedPump(NULL), + mStatusCode(0) { } virtual ~LLHTTPPipe() { -- cgit v1.2.3 From 68304cbd02442589c28458e0e2574d3a31aa1282 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:15:52 -0800 Subject: CID-312 Checker: UNINIT_CTOR Function: LLHTTPPipe::Response::Response() File: /indra/llmessage/lliohttpserver.cpp --- indra/llmessage/lliohttpserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index d6b672ef5c..27530fbfe1 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -116,7 +116,7 @@ private: void nullPipe(); private: - Response() {;} // Must be accessed through LLPointer. + Response() : mPipe(NULL) {} // Must be accessed through LLPointer. LLHTTPPipe* mPipe; }; friend class Response; -- cgit v1.2.3 From bdbb42c0f6c1f2a8afafca58435446e4e3cc37a2 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:16:59 -0800 Subject: CID-311 Checker: UNINIT_CTOR Function: LLXfer::LLXfer(int) File: /indra/llmessage/llxfer.cpp --- indra/llmessage/llxfer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp index 8404f6519d..7aa833ee32 100644 --- a/indra/llmessage/llxfer.cpp +++ b/indra/llmessage/llxfer.cpp @@ -74,6 +74,7 @@ void LLXfer::init (S32 chunk_size) mCallback = NULL; mCallbackDataHandle = NULL; + mCallbackResult = 0; mBufferContainsEOF = FALSE; mBuffer = NULL; -- cgit v1.2.3 From ce8e2fc322737e4afa56451ed13611c1c4b9dd45 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:19:56 -0800 Subject: CID-310 Checker: UNINIT_CTOR Function: LLSimpleResponse::LLSimpleResponse() File: /indra/llmessage/llhttpnode.h --- indra/llmessage/llhttpnode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h index 915aacb7cc..8212f58653 100644 --- a/indra/llmessage/llhttpnode.h +++ b/indra/llmessage/llhttpnode.h @@ -305,7 +305,7 @@ protected: ~LLSimpleResponse(); private: - LLSimpleResponse() {;} // Must be accessed through LLPointer. + LLSimpleResponse() : mCode(0) {} // Must be accessed through LLPointer. }; std::ostream& operator<<(std::ostream& out, const LLSimpleResponse& resp); -- cgit v1.2.3 From f4c0a5b042087214acc868783d4c98753070de5b Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:30:41 -0800 Subject: partial appeasement for CID-309 only this piece really matters. a bit. Checker: UNINIT_CTOR Function: LLMessageSystem::LLMessageSystem(const std::basic_string, std::allocator>&, unsigned int, int, int, int, bool, float, float) File: /indra/llmessage/message.cpp --- indra/llmessage/message.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index e56d818d65..916006bc2d 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -253,6 +253,8 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port, { init(); + mSendSize = 0; + mSystemVersionMajor = version_major; mSystemVersionMinor = version_minor; mSystemVersionPatch = version_patch; @@ -323,6 +325,8 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port, mMaxMessageTime = 1.f; mTrueReceiveSize = 0; + + mReceiveTime = 0.f; } -- cgit v1.2.3 From 641f292a5ada637da3729c77ebfccd6b7edab538 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:31:56 -0800 Subject: CID-308 Checker: UNINIT_CTOR Function: LLPartSysCompressedPacket::LLPartSysCompressedPacket() File: /indra/llmessage/partsyspacket.cpp --- indra/llmessage/partsyspacket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llmessage/partsyspacket.cpp b/indra/llmessage/partsyspacket.cpp index cfb3572d84..2f9e59accb 100644 --- a/indra/llmessage/partsyspacket.cpp +++ b/indra/llmessage/partsyspacket.cpp @@ -144,6 +144,8 @@ LLPartSysCompressedPacket::LLPartSysCompressedPacket() mData[i] = '\0'; } + mNumBytes = 0; + gSetInitDataDefaults(&mDefaults); } -- cgit v1.2.3 From 749eade1cb714728b7a98afdd94482603e121ea3 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:34:06 -0800 Subject: CID-307 Checker: UNINIT_CTOR Function: LLQueryResponder::LLQueryResponder() File: /indra/llmessage/llares.cpp --- indra/llmessage/llares.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 104629c157..52edfc86b9 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -175,7 +175,8 @@ void LLAres::rewriteURI(const std::string &uri, UriRewriteResponder *resp) LLQueryResponder::LLQueryResponder() : LLAres::QueryResponder(), - mResult(ARES_ENODATA) + mResult(ARES_ENODATA), + mType(RES_INVALID) { } -- cgit v1.2.3 From 1ce9515685408241495d7c6929bb37cb694d9006 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:35:36 -0800 Subject: CID-306 Checker: UNINIT_CTOR Function: LLAddrRecord::LLAddrRecord(LLResType, const std::basic_string, std::allocator>&, unsigned int) File: /indra/llmessage/llares.cpp --- indra/llmessage/llares.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 52edfc86b9..b29eb300fc 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -642,8 +642,10 @@ LLPtrRecord::LLPtrRecord(const std::string &name, unsigned ttl) } LLAddrRecord::LLAddrRecord(LLResType type, const std::string &name, - unsigned ttl) - : LLDnsRecord(type, name, ttl) + unsigned ttl) + : LLDnsRecord(type, name, ttl), + + mSize(0) { } -- cgit v1.2.3 From a09b94eff726f2390fc9300883cba7cd429af5d3 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:37:28 -0800 Subject: CID-305 Checker: UNINIT_CTOR Function: LLSrvRecord::LLSrvRecord(const std::basic_string, std::allocator>&, unsigned int) File: /indra/llmessage/llares.cpp --- indra/llmessage/llares.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index b29eb300fc..00e77d20e9 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -704,7 +704,11 @@ bail: } LLSrvRecord::LLSrvRecord(const std::string &name, unsigned ttl) - : LLHostRecord(RES_SRV, name, ttl) + : LLHostRecord(RES_SRV, name, ttl), + + mPriority(0), + mWeight(0), + mPort(0) { } -- cgit v1.2.3 From a65a0c4cfb41fd3e4132761c3633ce58050523cc Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:51:24 -0800 Subject: CID-300 Checker: UNINIT_CTOR Function: LLJoint::LLJoint(const std::basic_string, std::allocator>&, LLJoint*) File: /indra/llcharacter/lljoint.cpp --- indra/llcharacter/lljoint.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 37afcb7cda..5c49214051 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -70,6 +70,7 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent) mXform.setScaleChildOffset(TRUE); mXform.setScale(LLVector3(1.0f, 1.0f, 1.0f)); mDirtyFlags = MATRIX_DIRTY | ROTATION_DIRTY | POSITION_DIRTY; + mUpdateXform = FALSE; mJointNum = 0; setName(name); -- cgit v1.2.3 From 4cdb84d6c4302357a52ae5399a2ff9d998dc5779 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:53:14 -0800 Subject: CID-299 Checker: UNINIT_CTOR Function: LLUIColor::LLUIColor() File: /indra/llui/tests/llurlmatch_test.cpp --- indra/llui/tests/llurlmatch_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index f9dfee931b..24a32de268 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -25,6 +25,7 @@ // link seam LLUIColor::LLUIColor() + : mColorPtr(NULL) {} namespace tut -- cgit v1.2.3 From ccbf6088b7e383d7da8df40429b05fdb2c7523f6 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:54:24 -0800 Subject: CID-299 Checker: UNINIT_CTOR Function: LLUIColor::LLUIColor() File: /indra/llui/tests/llurlentry_test.cpp --- indra/llui/tests/llurlentry_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 6fec1d3e10..bc97cf3df2 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -33,7 +33,7 @@ LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& defa return LLUIColor(); } -LLUIColor::LLUIColor() {} +LLUIColor::LLUIColor() : mColorPtr(NULL) {} namespace tut { -- cgit v1.2.3 From e5e654ac5a58512c1c14b06d28a81882926e4e46 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:57:33 -0800 Subject: CID-298 Checker: UNINIT_CTOR Function: LLMsgData::LLMsgData(const char *) File: /indra/llmessage/llmessagetemplate.h --- indra/llmessage/llmessagetemplate.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index d7f02ebd85..8abc0aaab2 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -82,7 +82,7 @@ protected: class LLMsgBlkData { public: - LLMsgBlkData(const char *name, S32 blocknum) : mOffset(-1), mBlockNumber(blocknum), mTotalSize(-1) + LLMsgBlkData(const char *name, S32 blocknum) : mBlockNumber(blocknum), mTotalSize(-1) { mName = (char *)name; } @@ -108,7 +108,6 @@ public: temp->addData(data, size, type, data_size); } - S32 mOffset; S32 mBlockNumber; typedef LLDynamicArrayIndexed msg_var_data_map_t; msg_var_data_map_t mMemberVarData; @@ -136,7 +135,6 @@ public: void addDataFast(char *blockname, char *varname, const void *data, S32 size, EMsgVariableType type, S32 data_size = -1); public: - S32 mOffset; typedef std::map msg_blk_data_map_t; msg_blk_data_map_t mMemberBlocks; char *mName; -- cgit v1.2.3 From 525569825f38a5d601c7151d46a638f31bf0658f Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 15:58:45 -0800 Subject: CID-297 Checker: UNINIT_CTOR Function: LLFontFreetype::LLFontFreetype() File: /indra/llrender/llfontfreetype.cpp --- indra/llrender/llfontfreetype.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 786dc64452..9f7f3b2c67 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -112,6 +112,7 @@ LLFontFreetype::LLFontFreetype() mFTFace(NULL), mRenderGlyphCount(0), mAddGlyphCount(0), + mStyle(0), mPointSize(0) { } -- cgit v1.2.3 From 682f8afcc073b62fed64a3fd2adc5f65793e1f3e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 16:01:01 -0800 Subject: CID-296 Checker: UNINIT_CTOR Function: LLFontGlyphInfo::LLFontGlyphInfo(unsigned int) File: /indra/llrender/llfontfreetype.cpp --- indra/llrender/llfontfreetype.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 9f7f3b2c67..59e7d890f4 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -91,14 +91,15 @@ LLFontManager::~LLFontManager() LLFontGlyphInfo::LLFontGlyphInfo(U32 index) : mGlyphIndex(index), + mWidth(0), // In pixels + mHeight(0), // In pixels + mXAdvance(0.f), // In pixels + mYAdvance(0.f), // In pixels mXBitmapOffset(0), // Offset to the origin in the bitmap mYBitmapOffset(0), // Offset to the origin in the bitmap mXBearing(0), // Distance from baseline to left in pixels mYBearing(0), // Distance from baseline to top in pixels - mWidth(0), // In pixels - mHeight(0), // In pixels - mXAdvance(0.f), // In pixels - mYAdvance(0.f) // In pixels + mBitmapNum(0) // Which bitmap in the bitmap cache contains this glyph { } -- cgit v1.2.3 From 1de15af932742f198595b914b33a0af1dcc49894 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 29 Jan 2010 16:34:05 -0800 Subject: Fix button size so it works for most/all target languages --- indra/newview/skins/default/xui/en/floater_about.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index bfdd48e2f4..bc67621dfd 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -91,7 +91,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number left="10" top_pad="5" height="25" - width="160" /> + width="180" /> Date: Fri, 29 Jan 2010 17:08:28 -0800 Subject: DEV-43688 Cycle3 for FR --- .../skins/default/xui/fr/floater_about_land.xml | 147 ++++++----- .../default/xui/fr/floater_animation_preview.xml | 5 +- .../default/xui/fr/floater_avatar_textures.xml | 62 ++--- .../skins/default/xui/fr/floater_bulk_perms.xml | 2 +- .../skins/default/xui/fr/floater_buy_currency.xml | 2 +- .../skins/default/xui/fr/floater_color_picker.xml | 2 +- .../skins/default/xui/fr/floater_customize.xml | 62 ++--- .../skins/default/xui/fr/floater_god_tools.xml | 12 +- .../skins/default/xui/fr/floater_im_container.xml | 2 +- .../skins/default/xui/fr/floater_incoming_call.xml | 6 + .../skins/default/xui/fr/floater_lsl_guide.xml | 2 +- .../skins/default/xui/fr/floater_media_browser.xml | 2 +- .../default/xui/fr/floater_outfit_save_as.xml | 11 + .../skins/default/xui/fr/floater_outgoing_call.xml | 9 + .../skins/default/xui/fr/floater_preferences.xml | 2 +- .../default/xui/fr/floater_preview_gesture.xml | 3 + .../default/xui/fr/floater_preview_notecard.xml | 2 +- .../default/xui/fr/floater_preview_texture.xml | 5 +- .../skins/default/xui/fr/floater_report_abuse.xml | 4 +- .../skins/default/xui/fr/floater_script_limits.xml | 2 + .../skins/default/xui/fr/floater_search.xml | 7 + .../skins/default/xui/fr/floater_select_key.xml | 6 +- .../skins/default/xui/fr/floater_sell_land.xml | 2 +- .../skins/default/xui/fr/floater_snapshot.xml | 20 +- .../skins/default/xui/fr/floater_sys_well.xml | 9 +- .../skins/default/xui/fr/floater_telehub.xml | 8 +- .../skins/default/xui/fr/floater_texture_ctrl.xml | 2 +- .../newview/skins/default/xui/fr/floater_tools.xml | 13 +- .../skins/default/xui/fr/floater_top_objects.xml | 69 ++--- .../default/xui/fr/floater_voice_controls.xml | 30 ++- .../default/xui/fr/floater_whitelist_entry.xml | 2 +- .../skins/default/xui/fr/floater_window_size.xml | 17 ++ .../skins/default/xui/fr/floater_world_map.xml | 150 ++++++----- .../skins/default/xui/fr/inspect_avatar.xml | 10 +- .../newview/skins/default/xui/fr/inspect_group.xml | 1 + .../skins/default/xui/fr/menu_attachment_other.xml | 17 ++ .../skins/default/xui/fr/menu_attachment_self.xml | 12 + .../skins/default/xui/fr/menu_avatar_icon.xml | 2 +- .../skins/default/xui/fr/menu_avatar_other.xml | 16 ++ .../skins/default/xui/fr/menu_avatar_self.xml | 27 ++ .../skins/default/xui/fr/menu_bottomtray.xml | 5 + .../skins/default/xui/fr/menu_im_well_button.xml | 4 + .../skins/default/xui/fr/menu_imchiclet_adhoc.xml | 4 + .../skins/default/xui/fr/menu_imchiclet_p2p.xml | 2 +- .../default/xui/fr/menu_inspect_avatar_gear.xml | 1 + .../skins/default/xui/fr/menu_inventory.xml | 8 +- .../default/xui/fr/menu_inventory_gear_default.xml | 2 + indra/newview/skins/default/xui/fr/menu_land.xml | 9 + indra/newview/skins/default/xui/fr/menu_login.xml | 6 +- .../xui/fr/menu_notification_well_button.xml | 4 + indra/newview/skins/default/xui/fr/menu_object.xml | 25 ++ .../skins/default/xui/fr/menu_participant_list.xml | 17 +- .../skins/default/xui/fr/menu_people_groups.xml | 8 + .../skins/default/xui/fr/menu_people_nearby.xml | 1 + .../skins/default/xui/fr/menu_profile_overflow.xml | 4 + indra/newview/skins/default/xui/fr/menu_viewer.xml | 46 ++-- .../skins/default/xui/fr/mime_types_linux.xml | 217 ++++++++++++++++ .../skins/default/xui/fr/mime_types_mac.xml | 217 ++++++++++++++++ .../newview/skins/default/xui/fr/notifications.xml | 154 +++++------ .../default/xui/fr/panel_active_object_row.xml | 9 + .../default/xui/fr/panel_adhoc_control_panel.xml | 16 +- .../default/xui/fr/panel_avatar_list_item.xml | 1 + .../default/xui/fr/panel_block_list_sidetray.xml | 4 +- .../skins/default/xui/fr/panel_bottomtray.xml | 12 +- .../skins/default/xui/fr/panel_classified_info.xml | 4 +- .../skins/default/xui/fr/panel_edit_classified.xml | 4 +- .../skins/default/xui/fr/panel_edit_profile.xml | 5 +- .../newview/skins/default/xui/fr/panel_friends.xml | 10 +- .../default/xui/fr/panel_group_control_panel.xml | 20 +- .../skins/default/xui/fr/panel_group_general.xml | 8 +- .../default/xui/fr/panel_group_info_sidetray.xml | 2 + .../skins/default/xui/fr/panel_group_invite.xml | 6 +- .../skins/default/xui/fr/panel_group_list_item.xml | 1 + .../skins/default/xui/fr/panel_group_notices.xml | 14 +- .../skins/default/xui/fr/panel_group_notify.xml | 2 +- .../default/xui/fr/panel_im_control_panel.xml | 32 ++- .../skins/default/xui/fr/panel_landmark_info.xml | 1 + indra/newview/skins/default/xui/fr/panel_login.xml | 68 ++--- .../skins/default/xui/fr/panel_main_inventory.xml | 6 +- .../xui/fr/panel_media_settings_general.xml | 22 +- .../xui/fr/panel_media_settings_permissions.xml | 19 +- .../xui/fr/panel_media_settings_security.xml | 8 +- .../skins/default/xui/fr/panel_my_profile.xml | 80 +++--- .../skins/default/xui/fr/panel_navigation_bar.xml | 3 + indra/newview/skins/default/xui/fr/panel_notes.xml | 18 +- .../default/xui/fr/panel_outfits_inventory.xml | 15 +- .../fr/panel_outfits_inventory_gear_default.xml | 6 +- .../newview/skins/default/xui/fr/panel_people.xml | 1 + indra/newview/skins/default/xui/fr/panel_picks.xml | 12 +- .../skins/default/xui/fr/panel_place_profile.xml | 3 +- .../newview/skins/default/xui/fr/panel_places.xml | 7 +- .../default/xui/fr/panel_preferences_alerts.xml | 4 +- .../default/xui/fr/panel_preferences_chat.xml | 10 +- .../default/xui/fr/panel_preferences_general.xml | 26 +- .../default/xui/fr/panel_preferences_privacy.xml | 8 +- .../default/xui/fr/panel_preferences_setup.xml | 8 +- .../default/xui/fr/panel_preferences_sound.xml | 4 +- .../default/xui/fr/panel_prim_media_controls.xml | 52 +++- .../newview/skins/default/xui/fr/panel_profile.xml | 77 +++--- .../skins/default/xui/fr/panel_region_estate.xml | 10 +- .../skins/default/xui/fr/panel_region_general.xml | 6 +- .../default/xui/fr/panel_region_general_layout.xml | 43 +++ .../skins/default/xui/fr/panel_region_texture.xml | 3 +- .../xui/fr/panel_script_limits_my_avatar.xml | 13 + .../xui/fr/panel_script_limits_region_memory.xml | 24 ++ .../skins/default/xui/fr/panel_side_tray.xml | 11 +- .../skins/default/xui/fr/panel_status_bar.xml | 3 +- .../default/xui/fr/panel_teleport_history.xml | 4 +- .../default/xui/fr/panel_teleport_history_item.xml | 1 + .../newview/skins/default/xui/fr/role_actions.xml | 245 +++++------------- .../skins/default/xui/fr/sidepanel_appearance.xml | 8 +- .../skins/default/xui/fr/sidepanel_inventory.xml | 2 +- .../skins/default/xui/fr/sidepanel_item_info.xml | 57 ++-- .../skins/default/xui/fr/sidepanel_task_info.xml | 76 +++--- indra/newview/skins/default/xui/fr/strings.xml | 288 +++++++++++++++++++-- 115 files changed, 1912 insertions(+), 988 deletions(-) create mode 100644 indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_script_limits.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_window_size.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_attachment_other.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_attachment_self.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_avatar_other.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_avatar_self.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_im_well_button.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_land.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_notification_well_button.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_object.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_people_groups.xml create mode 100644 indra/newview/skins/default/xui/fr/mime_types_linux.xml create mode 100644 indra/newview/skins/default/xui/fr/mime_types_mac.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_active_object_row.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_region_general_layout.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index cf595edab9..4c97551e55 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -13,7 +13,7 @@ restantes - + Nouveaux utilisateurs uniquement @@ -36,10 +36,10 @@ (propriété du groupe) - Profil... + Profil - Infos... + Infos (public) @@ -52,7 +52,6 @@ Aucune parcelle sélectionnée. -Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails. Nom : @@ -80,14 +79,15 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa Leyla Linden -