Commit Graph

69 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nat Goodspeed 62527e6f18 MAINT-5506: Fix ugly timing bug in llurlentry static initialization.
The problem was that class-static LLUrlEntryParcel::sRegionHost was being
initialized by copying class-static LLHost::invalid. Naturally, these two
statics are initialized in different source files. Since C++ makes no promises
about the relative order in which objects in different object files are
initialized, it seems we hit a case in which we were trying to initialize
sRegionHost by copying a completely uninitialized LLHost::invalid.
In general we might attempt to address such cross-translation-unit issues by
introducing an LLSingleton. But in this particular case, the punch line is
that LLHost::invalid is explicitly constructed identically to a
default-constructed LLHost! In other words, LLHost::invalid provides nothing
we couldn't get from LLHost(). All it gives us is an opportunity for glitches
such as the above.
Remove LLHost::invalid and all references, replacing with LLHost().
2015-08-18 17:05:29 -04:00
callum_linden e4977efddb Update to build on Xcode 6.0: removed unised const variables [-Wunused-const-variable] 2014-10-17 14:48:17 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Merov Linden 3a49beed0e CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up. 2012-12-05 20:25:46 -08:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Leyla Farazha c489f33169 DN-217 Changing between View Display Names on and off during a conference call session put viewer in a state where last name resident was shown in viewer everywhere for user in conference call with last name resident. 2010-11-30 16:37:31 -08:00
Leyla Farazha 739e4ac541 DN-212 [crashhunters] LLCacheName::buildLegacyName 2010-11-23 11:25:40 -08:00
Leyla Farazha dfdd1abe51 DN-188 Fixed users with lastname residents not having inspectors in chat history 2010-11-04 11:51:45 -07:00
Leyla Farazha ebc8cdd6cb DN-154 Display Names only shown in Nearby Chat History when a user logs back in even if Usernames were shown in Chat during previous session 2010-10-29 13:15:16 -07:00
Leyla Farazha 97164f010c DN-188 Inspectors and Profile images not available in IM history or local chat history 2010-10-27 15:24:22 -07:00
Leyla Farazha cb5d8d1a92 DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt 2010-10-22 17:41:06 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
James Cook 00e8b3548c DEV-50013 Region debug top scripts/colliders display names 2010-05-27 18:08:49 -07:00
Leyla Farazha 6cb420b20b added function for building a username from a legacy name and fixed group notice panel
reviewed by James
2010-05-27 15:12:03 -07:00
James Cook 77e6fcd423 DEV-50013 WIP gCacheName->getGroup() to distinguish from av lookups
Helps with global finds looking for remaining calls to patch.
Reviewed with Leyla.
2010-05-25 11:39:06 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Vadim Savchuk e2d32b9e9d Fixed bug EXT-5415 (Edit floater and object profile show group as "loading..." when set to "none").
Made LLCacheName getGroupName() and getName() methods return TRUE if the given group/avatar name is NULL, so that LLNameBox doesn't display "Loading..." indefinitely.
There's nothing to wait for in case of NULL id: the name cache returns a predefined name that won't change (i.e. it's the final result).

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/223/

--HG--
branch : product-engine
2010-04-13 16:29:33 +03:00
James Cook d063259863 Work around bad usernames occasionally sent from server. 2010-03-03 16:41:17 -08:00
James Cook 822d042e0c Don't load cached names with blank last names, avoids data corruption 2010-03-02 11:15:28 -08:00
James Cook c1d7e7d5d9 Added clear() method for debugging 2010-02-19 10:53:17 -08:00
James Cook 5774acb84e Added function LLCacheName::cleanFullName() to strip " Resident" from strings 2010-02-17 09:19:06 -08:00
James Cook 6a69a696d2 Store last name Resident in cache for now, but don't use for reverse lookups 2010-02-16 16:59:34 -08:00
James Cook b34225a191 Fix server to use updated LLCacheName API.
Fixed callback signatures.
Added LLCacheName::getDefaultLastName() to return "Resident"
Reviewed with Huseby
2010-02-16 10:40:53 -08:00
James Cook c16591c046 Per-avatar customizable icons next to name links in text
Changed LLUrlEntryAgent callbacks to handle both link label and icon
Eliminated legacy LLNameCache file loading
Reviewed with Kelly
2010-02-12 16:12:12 -08:00
James Cook 4c4ba93002 Removed temporary LLCacheName::getDisplayName code 2010-02-11 16:44:42 -08:00
James Cook f3e4bd08c8 Added Jose Sanchez as display name for bobsmith123 2010-02-10 12:03:09 -08:00
James Cook 42176145c9 Converted names build from avatar object LLNameValue pairs to SLID
Added temporary getDisplayName() to LLCacheName
Moved temporary placeholder display names into LLCacheName
Eliminated rarely used LLAgentUI::buildName in favor of buildFullName
Standardized buildFullName capitalization
2010-02-08 14:55:30 -08:00
James Cook 88350edbcb merge 2010-02-03 14:13:56 -08:00
James Cook 146e9d5e4d Support returning full_name (and SLID) for LLCacheName::get() calls
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
2010-02-01 17:06:18 -08:00
Tofu Linden ee82ed694c CID-317
Checker: UNINIT_CTOR
Function: LLCacheNameEntry::LLCacheNameEntry()
File: /indra/llmessage/llcachename.cpp
2010-01-29 15:02:32 -08:00
Tofu Linden b3c1d0dc07 CID-254
Checker: UNINIT
Function: LLCacheName::Impl::processUUIDRequest(LLMessageSystem *, bool)
File: /indra/llmessage/llcachename.cpp
2010-01-27 15:59:56 -08:00
James Cook dd9bfb6d85 LLCacheName and LLUrlEntryAgent now understand SLIDs - accounts
with "Resident" as last name should not display that name.
Also added test display names.
2010-01-22 16:52:53 -08:00
Steve Bennetts 699fc13edb Added reverse LLCacheName lookup. 2009-11-23 17:01:45 -08:00
Bryan O'Sullivan 3e5819d862 Trivial commit for hg import purposes 2009-09-01 18:01:40 +00:00
Nat Goodspeed fcaa1ad46f QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Dave Simmons 24b26d71ee svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00
Robert Knop f1380f2fc3 Merging from the server/server-1.25 branch
svn merge -r107352:108210
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Merge conflicts were resolved:

  scripts/start-server   : one conflict, kept the "working" version

  indra/llcommon/llversionserver.h : reverted
  indra/newview/Info-SecondLife.plist : reverted
  indra/newview/res/viewerRes.rc : reverted

  indra/newsim/llagentinfo.cpp : kept *both*... "working" had
      is_agent_online, which nothing else had, and the merge had
      isGodAllowed(), part of SEC resolution

  indra/backbone/agent_router.py : kartic & rdw merged and reviewed
      using brains and things

  indra/newsim/llsimhttpresponder.cpp : doesn't exist in trunk, and
      that's OK (even though there was a change for it)
2009-01-19 20:40:59 +00:00