Age | Commit message (Collapse) | Author |
|
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
|
|
|
|
|
|
|
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
|
|
|
|
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
|
|
|
|
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.
|
|
|
|
|
|
in even if Usernames were shown in Chat during previous session
|
|
chat history
|
|
|
|
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
|
|
|
|
|
|
notice panel
reviewed by James
|
|
Helps with global finds looking for remaining calls to patch.
Reviewed with Leyla.
|
|
|
|
"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
|
|
|
|
|
|
|
|
|
|
|
|
Fixed callback signatures.
Added LLCacheName::getDefaultLastName() to return "Resident"
Reviewed with Huseby
|
|
Changed LLUrlEntryAgent callbacks to handle both link label and icon
Eliminated legacy LLNameCache file loading
Reviewed with Kelly
|
|
|
|
|
|
Added temporary getDisplayName() to LLCacheName
Moved temporary placeholder display names into LLCacheName
Eliminated rarely used LLAgentUI::buildName in favor of buildFullName
Standardized buildFullName capitalization
|
|
|
|
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
|
|
Checker: UNINIT_CTOR
Function: LLCacheNameEntry::LLCacheNameEntry()
File: /indra/llmessage/llcachename.cpp
|
|
Checker: UNINIT
Function: LLCacheName::Impl::processUUIDRequest(LLMessageSystem *, bool)
File: /indra/llmessage/llcachename.cpp
|
|
with "Resident" as last name should not display that name.
Also added test display names.
|
|
|
|
|
|
Boost.Signals2 like the rest of the event-system-n code.
|
|
ignore-dead-branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
|
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)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
NOTE : also ran
scripts/update_version_files.py --verbose --server --server_channel="Second Life Server"
to update server version information before doing a compile test.
Committed with the results of this version file update.
Conflicts resolved by prospero:
scripts/maintenance/update-groups.py : kept the trunk version (was
merged from Rad Chillies)
scripts/make_deploy_group.py : merge by hand (I'm the one to do this,
anyway)
indra/llcommon/llversionserver.h : kept trunk version
indra/newsim/llgettaskstats.cpp : kept trunk version. (svn revert)This
was imported late into 1.25, after the
branch merged into trunk, and no
changes were made in the 1.25 branch
after the import.
indra/newsim/llparcelstats.cpp : same as llgettaskstats.cpp
indra/newsim/llscriptcounter.h : same as llgettaskstats.cpp
indra/newsim/llagentinfo.cpp : like llgettaskstats.cpp, but more
complicated as some of soft's God-logging
that came from 1.24->1.25 was in here.
Fortunately, the conflict was trivial
(missing include)
idnra/newsim/simulator.cpp : one small conflict. Kept the 1.25 version
of SKU/product stuff, as it was likely part
of the homestead stuff that was recently
put into 1.25. However, there was some
code after that in the merge conflict that
had been removed from trunk that I also
removed in the resolution. This code is 27
lines starting at the comment "Asset cache
service", as can be found in the
server-1.25 branch.
indra/newsim/tests/fakeobjects.h : kept the trunk version. No changes
to 1.25 after parcel stats merge,
except for a compile error fixed by
andrew about which he warned there
would be merge issues...
indra/newsim/tests/llgettaskstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/tests/lllslmanager_tests.cpp : same as llgettaskstats.cpp
indra/newsim/tests/llparcelstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/llgettaskstats.h : same as llgettaskstats.cpp
indra/newsim/llparcelstats.h : same as llgettaskstats.cpp
indra/newsim/llscriptdata.cpp : same as llgettaskstats.cpp, except for a
fix that josh made both to trunk and
1.25
indra/newsim/llscriptdata.h : same as llscriptdata.cpp
indra/newsim/llscriptcounter.cpp : same as llgettaskstats.cpp
indra/newsim/CMakeLists.txt : similar to llgettaskstats.cpp, except that
there was an additional change to trunk
(so doing "svn revert" to keep trunk is
still the right thing)
indra/backbone/multiagentchat.py : where there were conflicts, kept the
server-1.25 version. Phoenix had put
in some fixes for dealing with
omissions of the accept header in the
1.25 branch.
indra/backbone/group_linden_dollar.py : similar to multiagentchat.py.
All but one or two conflicts
were utterly trivial (missing
blank line)
indra/backbone/agent_linden_dollar.py : all merge conflicts were utterly
trivial (missing blank line);
I'm surprised svn got all fussy
about them.
indra/lib/python : conflict was because the externals had been futzed
with in 1.25 during debugging of backbone memory
bloat. Kept the externals as in trunk.
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn merge -r94899:95259 svn+ssh://svn/svn/linden/branches/dpo-lock-qar-702 .
QA Tested : Mick
I understand that the dataserver-is-deprecated - kk
|
|
dataserver-is-deprecated
|
|
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
|
|
QAR-442
|
|
79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
|