| Age | Commit message (Collapse) | Author | 
|---|
|  | support | 
|  | another attempt to move mem stat into base class | 
|  | changed unit declarations macros to make a lot more sense | 
|  |  | 
|  |  | 
|  |  | 
|  | gcc 4.1/4.2 support | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | 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.) | 
|  | Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff | 
|  |  | 
|  |  | 
|  | --HG--
branch : avatar-pipeline | 
|  | --HG--
branch : avatar-pipeline | 
|  | reviewed by Nat | 
|  | --HG--
branch : avatar-pipeline | 
|  |  | 
|  | tooltips to 3D avatars, 2D avatar names, and 3D objects.  Refactors tooltips and text boxes, line editors, and text editors.  Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry | 
|  | The problem arose because we were setting LL_COMMON_BUILD in
llcommon/CMakeLists.txt, not only for the library build itself but also for
its LL_ADD_INTEGRATION_TEST tests. This told all the headers compiled into the
INTEGRATION_TEST_lllazy executable that the executable was providing all the
llcommon symbols, rather than importing them.
The solution is to switch to the llcommon_EXPORTS symbol automagically defined
by CMake when building the llcommon shared library itself. | 
|  | I'll need to rebuild that, plus a couple other minor clenaups. | 
|  | Moves libllcommon.so to a staging dir for unit tests to work
and gets rid of LL_COMMON_API in forward declarations | 
|  | merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v | 
|  |  | 
|  | Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed) | 
|  | svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew. | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers | 
|  | HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it. | 
|  |  | 
|  | svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | 
|  | release
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269 | 
|  | avatar rendering.  Visual Studio 2005 project file fixed pending. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. | 
|  | Adds Dev Studio 2005 (VC8)
Reviewed by Rob | 
|  |  | 
|  | svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base | 
|  | svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
	llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
	llfontgl.cpp (from maintenance r50207) - whitespace only
	inventorybridge.cpp (property - non-executable)
	skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL | 
|  |  |