1aef4820a5
EXT-3780 Added linux impl - wip
2010-05-03 17:06:14 -07:00
1b82707771
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-30 22:52:40 -06:00
32be2a798b
for EXT-7181: create a cheaper call stack tracing tool.
2010-04-30 15:42:48 -06:00
10b0734135
Bumped version to 2.0.2.0 - just in case
2010-04-30 12:59:53 -07:00
29e1804139
automated merge
2010-04-28 13:37:21 -04:00
5f104c1cb5
EXT-7076 : Allow "paste as link" for any item
...
Changed llassettype dictionary table to enable linking to most item types.
2010-04-27 14:02:49 -04:00
ca07973e3e
Making use of LLCommonUtils::computeDifference.
...
Replaced duplicating code with generic function LLCommonUtils::computeDifference()
Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/313/
--HG--
branch : product-engine
2010-04-27 10:20:30 +03:00
a42dcc3f5e
automated merge
2010-04-23 13:24:09 -07:00
b15e2beabf
Implemented EXT-6724(normal task) - Implement flat list view of filtered inventory for "add wearables" panel of outfit editor
...
1. Modified LLInventoryItemsList - implemented delayed item construction. Items are added during draw, not more than 50 items will be added in single draw. This lets us reduce system overload during multiple panel construction.
2. Implemented LLFilteredWearableListManager to populate inventory flat list with data. This class filters entire inventory according to specified filter and populates specified inventory list with data.
3. Created LLCommonUtil::computeDifference() to avoid code copy-pasting(will use it in all appropriate places in next review request)
Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/301/
--HG--
branch : product-engine
2010-04-22 15:48:48 +03:00
270d133882
Automated merge
2010-04-21 11:43:43 -07:00
5952fbca31
merge from viewer-hotfix
2010-04-20 12:29:20 +01:00
7462911bdd
Change Linux fasttimer implementation back to RDTSC - using a reliable syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly.
...
But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway.
Also change many instances of Mhz to MHz.
Also some minor comment fixes.
2010-04-19 12:49:15 +01:00
799e014f2a
Backed out changeset eaac19489aa6
...
Bao agreed with my initial version after all.
2010-04-15 20:31:56 +01:00
59446d5505
be gentler on negative-offset reads - just do nothing instead of asserting. from bao's review.
...
(transplanted from 061b8b55838634425455ebc4ac046462dfc0e5f1)
2010-04-15 19:40:58 +01:00
1c63896154
Supporting 'read from the end' doesn't make sense (to me), unlike 'write
...
from the end'.
Also, more comments.
Also, try to avoid a seek when offset==0 in read.
To be reviewed by Bao.
(transplanted from 60eb013221a83ff76054ab7dcb1d07c108f51a9d)
2010-04-15 18:00:00 +01:00
fae92a2df8
some clean-up of lllfsthread to help me understand it, remove one extraneous close(). to be reviewed by bao.
...
(transplanted from 17c6af7a2396f9890aab8226356a556b4d58a7d8)
2010-04-15 16:55:34 +01:00
8d8f167a4e
automated merge with trunk
2010-04-19 16:24:05 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
347be07842
set the patch version
2010-04-20 04:36:35 -04:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
9523c70f9d
DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
...
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser). Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)
Also, refactor of voice to modularize it, and add a diamondware voice module.
CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
569f322f0d
PE merge
2010-04-01 17:12:12 +01:00
97f9dbee2c
BOOL->bool on llassettype.*
2010-04-01 14:40:44 +01:00
25976eb3da
Merge from default branch
...
--HG--
branch : product-engine
2010-04-01 12:28:08 +03:00
ac271e1d50
Include channel names in update_version_files.py invocation to fix bad viewer channel name.
2010-03-31 15:24:42 -07:00
d4fef262bc
EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionary
...
Took out some ugly case statements and stuck those functions into the asset dictionary instead. This makes the code a lot more centralized/extensible since if we ever add assets, it'll be clear that their fetch/knowable fields need to be added (versus that logic being in some obscure case statement).
2010-03-31 12:05:51 -04:00
3e23c04c9b
Merge from default branch
...
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
86dc5bce1a
Automated merge
2010-03-29 16:24:58 -07:00
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
b1b5a11bb0
EXT-3075 : Remove swear words from comments across viewer
...
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
b7d0bb9e1e
Fixed bug EXT-6399 (System locale is the same for all languages).
...
Problem:
* English locale was set for all languages.
* Specifying a correct locale didn't affect anything, including date/time formatting.
My investigation has shown that LLStringUtil was instantiated twice: in the
main binary and in libllcommon.so.
Because LLStringUtil::setLocale() was called from newview and getLocale()
was called from llcommon, they effectively used *different* instances of
LLStringUtil::sLocale. Hence getLocale() always returned empty string.
This seems to be caused by get/setLocale() methods not being dllexported.
The fix instantiates get/setLocale() and sLocale in llcommon and exposes
them to use from newview (i.e. prevents multiple instantiation).
Besides, I specified correct locale names for all languages and platforms.
Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/104/
--HG--
branch : product-engine
2010-03-26 19:09:11 +02:00
fad31dc087
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-25 17:46:36 -06:00
09d488e20b
more fix for EXT-5711: Some textures loading from cache seems jammed.
...
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
81350ec5a9
more fix for EXT-5711: Some textures loading from cache seems jammed.
...
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
3d373997dd
CID-449
...
Checker: FORWARD_NULL
Function: LLWorkerClass::checkWork(bool)
File: /indra/llcommon/llworkerthread.cpp
2010-03-23 14:01:30 +00:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
33746d7c73
merge
...
--HG--
branch : product-engine
2010-03-18 16:43:11 +02:00
11e4b42ec9
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
63375642c8
Backed out changeset 0305673fe81e EXT-4820 [NUX] Viewer dimensions on first-run
...
--HG--
branch : product-engine
2010-03-18 16:32:55 +02:00
c67bc96278
Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."
--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
e5c4438fd7
merge
2010-03-09 13:27:26 -08:00
20379fecd9
automated merge
2010-03-08 21:39:38 -08:00
0775e91901
PE merge.
2010-03-07 15:27:17 +00:00
dcf279d663
EXT-2418 added open/sit/buy mouse cursors
2010-03-05 18:34:36 -08:00
48fd4c8d14
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
d33b6a1887
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 09:15:18 -07:00
b0d4919fd4
fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: LLWorkerClass::checkWork: ASSERT(workreq).
2010-03-04 15:02:30 -07:00
70000e0b1e
Fixed Win build.
...
--HG--
branch : product-engine
2010-03-04 17:08:21 +02:00
99f5cc8151
merge
...
--HG--
branch : product-engine
2010-03-04 16:53:21 +02:00
b6d5909ddc
partitial fix for major EXT-4820 [NUX] Viewer dimensions on first-run
...
need to specify desctop width and height for macos and linux (see LLDesctopInfo in llsys.cpp for details)
--HG--
branch : product-engine
2010-03-04 15:43:14 +02:00
66efd3f432
fix windows build break again
2010-03-02 14:29:42 -08:00
6575b685e9
fixed EXT-5526 Objects are shown as persons in the chat history from previous sessions
...
- new chat source type CHAT_SOURCE_UNKNOWN for avatar names not in cache and object names consisting of two words (avatar names like)
- new icon (unknown_icon.png) for message headers () of nearby chat messagses coming from CHAT_SOURCE_UNKNOWN
- context menu no longer displayed for object names from chat history (no UUIDs)
- double click on message headers in nearby chat no longer opens Inspector (no UUIDs)
- object names (loaded from chat history) in nearby chat are no longer SLURLed (no UUIDs for them)
--HG--
branch : product-engine
2010-02-24 17:18:05 +02:00
10c5f2f080
Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd timestamp for messages (nearby chat/im) received today)
...
--HG--
branch : product-engine
2010-02-19 13:36:47 +02:00
9fee359d1b
CID-3
...
Checker: CHECKED_RETURN
Function: LLImageDecodeThread::update(unsigned int)
File: /indra/llimage/llimageworker.cpp
2010-02-13 14:37:48 +00:00
a4d224ff93
EXT-5055 LLInstanceTracker promotes some dangerous patterns - detect them
2010-02-06 21:38:57 +00:00
346cabd557
make the instancetracker unit test really, like, work. before I fiddle with a big pile of stuff.
2010-02-06 21:03:55 +00:00
4c7ae59996
move LLEventTimer into its own source module. everyone includes it, almost no-one wants it. now I can dick with it a bit without rebuilding the world, at least. :)
2010-02-06 18:59:44 +00:00
ec076c97fe
EXT-4754 Fix for LLEventTimer::updateClass crash.
...
Ugh. Update on Tofu's patch for this bug.
Reviewed by Richard
2010-02-05 18:15:31 -08:00
2c30ccf34d
EXT-4754 Crash in LLEventTimer::updateClass
2010-02-04 11:24:14 +00:00
14d942f16b
A flag+assert to help track bad behaviour in LLEventTimer, especially EXT-4754
2010-02-04 11:08:49 +00:00
33a92be286
CID-269
...
Checker: UNINIT_CTOR
Function: LLWorkerClass::LLWorkerClass(LLWorkerThread *, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llcommon/llworkerthread.cpp
2010-02-03 20:39:52 +00:00
193f2e2edc
CID-271
...
Checker: UNINIT_CTOR
Function: LLTreeDFSIter<LLView, std::list<LLView *, std::allocator<LLView *>>::_Const_iterator<(bool)0>>::LLTreeDFSIter()
File: /indra/llcommon/lltreeiterators.h
2010-02-03 20:36:56 +00:00
8b4823acfb
CID-272
...
Checker: UNINIT_CTOR
Function: LLTreeDFSPostIter<LLView, std::list<LLView *, std::allocator<LLView *>>::_Const_iterator<(bool)0>>::LLTreeDFSPostIter()
File: /indra/llcommon/lltreeiterators.h
2010-02-03 20:33:47 +00:00
930035ebdc
CID-273
...
Checker: UNINIT_CTOR
Function: NamedTimerFactory::NamedTimerFactory()
File: /indra/llcommon/llfasttimer_class.cpp
2010-02-03 20:29:57 +00:00
58f813a136
merge
2010-02-02 14:45:42 -08:00
0f07ec0c69
Pushing processor id windows fixes to working branch.
2010-02-02 14:42:32 -08:00
4665ef7b9c
Added cpu frequency. puching to move to windows. again.
2010-02-01 17:00:21 -08:00
45e700cb3e
merge
2010-02-01 12:39:59 -08:00
6abecf1228
pushing to private repo to move to windows development.
2010-02-01 11:23:30 -08:00
c6fb7a0b1a
Hint to compiler that logging is never *expected* on the fast-path.
2010-02-01 12:13:12 +00:00
86609394ca
fixed major EXT-3643 “Embed friendship offer into IM window”;
...
--HG--
branch : product-engine
2010-01-29 17:48:10 +02:00
f6fceac081
fixed EXT-3841 [BSI] "Send IM..." choosable in IM floater context menu
...
--HG--
branch : product-engine
2010-01-28 15:51:49 +02:00
e133a98246
CID-227
...
Checker: STRING_OVERFLOW
Function: CProcessor::AnalyzeIntelProcessor()
File: /indra/llcommon/llprocessor.cpp
2010-01-27 15:49:22 -08:00
9e2ba40d13
less dumb partial fix for CID-219
2010-01-27 15:45:41 -08:00
a7c3fde789
partial fix for CID-219
...
Checker: STREAM_FORMAT_STATE
Function: LLDate::toStream(std::basic_ostream<char, std::char_traits<char>>&) const
File: /indra/llcommon/lldate.cpp
2010-01-27 15:45:07 -08:00
4321857774
CID-220
...
Checker: STREAM_FORMAT_STATE
Function: encode_character(std::basic_ostream<char, std::char_traits<char>>&, char)
File: /indra/llcommon/lluri.cpp
2010-01-27 15:37:28 -08:00
635290cc87
CID-186
...
Checker: RESOURCE_LEAK
Function: LLStringUtilBase<unsigned int>::addCRLF(std::basic_string<unsigned int, std::char_traits<unsigned int>, std::allocator<unsigned int>>&)
File: /indra/llcommon/llstring.h
2010-01-27 15:09:25 -08:00
3616ed1e99
sigh, follow-up fix.
2010-01-27 13:28:13 -08:00
eeb30616f6
CID-99
...
Checker: INVALIDATE_ITERATOR
Function: LLAllocatorHeapProfile::parse(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llcommon/llallocator_heap_profile.cpp
not a bug, but make it clearer to coverity.
2010-01-27 13:26:05 -08:00
b77fe6dc72
DEV-45468 SNOW-108: Fast timers are broken / badly-scaled on linux
...
more reliable fix based on feedback from Richard. dicked with the Darwin results too since those seemed wrong based on the same feedback (also covered in test plan).
2010-01-26 12:35:22 -08:00
cbe647786f
We already have a LL_FORCE_INLINE in llpreprocessor.h, don't re-invent it for llfasttimers.h.
...
Also define LL_LIKELY/LL_UNLIKELY with a warning about its micro-optimizey nature, and use it to annotate llasserts (i.e. make llassert() lower-overhead and thus more attractive, even in inner-ish loops.)
2010-01-25 14:25:58 -08:00
2375afc428
Gosh, the mac prototypes for get_cpu_clock_count_64 have always been wrong, but the compiler didn't start caring until I made these proper member functions.
...
fixed.
2010-01-25 13:49:13 -08:00
18bdeb3d0e
DEV-45468 'SNOW-108: Fast timers are broken / badly-scaled on linux' ready to merge.
...
legacy coding policy fix-up.
2010-01-25 13:32:49 -08:00
3d0ff2585e
Final fix for fast timer reshuffle.
2010-01-25 13:24:45 -08:00
ec7b204ed6
shuffle shuffle of timer code. cleanup.
2010-01-25 12:31:50 -08:00
563daa96a8
pull in the linux+solaris fast-timers impl from snowglobe, fit it into viewer2, start moving headers around.
2010-01-25 12:07:25 -08:00
947398563e
merge
2010-01-22 17:40:28 -08:00
337716d946
LLPointer cleanup and fix for EXT-4413
...
reviewed by Rick
2010-01-22 16:51:13 -08:00
5a83247f03
Fix assert in lldictionary as used by llfoldertype
...
Review #88
This assert might be valid in general, but LLFolderType has a valid reason for getting "not found"
2010-01-22 14:03:13 -08:00
a0666bdb70
Turn on llassert() and llverify() for RelWithDebInfo builds.
...
Convert top firing asserts into big warnings.
To be reviewed by Mani.
2010-01-21 14:42:11 -08:00
2d65e6295d
Convert all C++ files to Unix line endings
2010-01-20 10:35:22 -08:00
798e33767f
fix for gcc build
2010-01-15 19:15:27 -08:00
9e506e499c
wrong line endings
2010-01-15 18:50:27 -08:00
d87de15776
fix for build error in xmmintrins.h
2010-01-15 18:45:18 -08:00
d278333828
fix for mac fast timer resetting too often
2010-01-13 19:16:59 -08:00
6da4746d5c
better commented fix for VS2005 compile issues
...
reviewed by Leyla
2010-01-13 17:48:49 -08:00
ab1ec1285d
potential fix for build issues on vs2005
2010-01-13 17:33:27 -08:00
03104e6998
intermediate commit, to pass to windows machine
2010-01-11 16:43:06 -08:00
daa4965fe0
renamed LLFastTimerUtil to LLFastTimer
2010-01-11 12:05:13 -08:00
Mark Palange (Mani)