ff51d31af3
remove windows line endings introduced via transplant
2010-02-05 17:38:26 -08:00
8f2df75f3d
Fix build.
2009-10-16 19:26:46 -07:00
b90c7d648e
Use malloc in order to fix linking issue
2009-10-15 19:40:20 -07:00
73e86b0bed
MAC Address Change no longer causes viewer to die cr:Roxie
2009-10-15 16:52:03 -07:00
7ab41a8a81
transplant with 2517, also fix single username login issue
2010-02-05 15:59:14 -08:00
b5f64f9a3f
Fix linux build
2010-02-05 01:37:36 -08:00
796ac35ca5
Disable SHARED_LIB_STAGING_DIR usage on systems where it's not initialized.
2009-07-15 13:55:09 -07:00
408bed3d6b
Revert rev 126736 for DEV-35109 which made location history in nav bar show all teleports instead of only those typed. viewer-2 now meets current spec, but spec is under discussion and Product Engine may be asked to reimplement something different.
...
Merging revisions 126736-126735 of svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-15 20:20:30 +00:00
5354caa136
Fixed compile warnings in llmath/llrect.h. This header is now included in a unit test
...
in indra/test where warnings are treated as errors.
2009-07-15 18:10:00 +00:00
d025b721e0
svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691
...
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
QAR-1691
2009-07-15 17:55:58 +00:00
28c9537398
DEV-35500: Write new llmath unit tests
...
- Added unit tests for LLRect and LLBBoxLocal in indra/test
- Moved newview/LLBBox to llmath, and added unit tests for it
- Removed methods in llbboxlocal.h and llbbox.h that were not
actually implemented (declared in .h, but not defined in cpp)
Reviewed by babbage.
2009-07-15 16:02:31 +00:00
7cdaba2332
Fixing DEV-35175 regression.
...
Context Windows will now spawn up if too far down, and spawn left if too far right.
reviewed by James
2009-07-15 01:12:51 +00:00
83a6ea234f
Merge skinning-15 to viewer-2. Fixes include:
...
DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly)
DEV-35143 Modal alerts appear behind side tray
DEV-35141 Landmarks image and description outside of landmarks
Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry
2009-07-14 19:06:17 +00:00
9ecdbd8b72
QAR-1602 checkpoint for multiple textures
...
Fixing merge problems - updating LLLocalTextureObject (new class) to work with Bao's texture refactoring.
-Nyx
2009-07-14 17:14:40 +00:00
c2e425e539
QAR-1651
...
svn merge -r126784:126785 svn+ssh://svn.lindenlab.com/svn/linden/branches/mock-3 into trunk
2009-07-14 16:52:40 +00:00
29e5f09d12
QAR-1602 checkpoint for avatar pipeline multiple textures
...
merge missed the addition of two new files. committing separately.
-Nyx
2009-07-14 15:50:34 +00:00
4447005b72
DEV-34299 - VWR-13996: Avatars are invisible, except for attachments
...
One-line fix for a very old bug. Bug was hunted and fixed by resident Aleric Inglewood. Code reviewed by Nyx. Patch is a one-off, de minimis change. Contact Nyx if any problems with this code.
-Nyx
2009-07-14 15:24:37 +00:00
56e0455479
QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
...
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.
-Nyx
2009-07-14 15:14:46 +00:00
7c29b45cc8
Line ending normalization.
2009-07-13 11:25:44 -07:00
064e917e3d
Removed unused floater visibility settings ShowDirectory, ShowLeaders, ShowTools. Trivial, not reviewed.
2009-07-13 17:15:19 +00:00
104f32750e
add LLImageGL::create(...) back for server side use.
2009-07-11 02:09:37 +00:00
675ed878cf
Merged in my debug build and shutdown cleanup changes.
2009-07-10 18:30:02 -07:00
da038e6c8f
First draft of cleaning up eventhost module on viewer shutdown. Still need to make the whole system more generalized and data driven.
2009-07-10 18:29:10 -07:00
b6fec6f1fc
Fix for crash when running windows debug build. std::string::replace cannot take NULL for it's argument.
2009-07-10 18:28:16 -07:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
8b7f7143d6
Brad's changes to testquit so we can pass executable to run to it.
...
Switching eventlet to use subrepo.
By Brad, reviewed by Palmer
2009-07-10 14:53:11 -07:00
e4dc104e32
EXT-70 Camera and Movement controls don't save their positions
...
DEV-35250 Quitting from the login screen forgets window placement and visibility (e.g. movement and camera floaters)
reviewed by Leyla
2009-07-10 21:18:42 +00:00
923d84d08f
EXT-127: Tooltips don't disappear immediately after moving mouse out of object
...
reviewed by Austin
2009-07-10 20:43:08 +00:00
9bc9a69688
Merged in my latest changes including switching LLAPRSockStream to be fully non-blocking (and thus not horribly inefficient) and a bunch of new event listener implementations.
2009-07-10 13:15:06 -07:00
3013aa1c84
Added an LLAgentListener implementation for event requests like teleport, sit, stand, etc.
2009-07-10 13:09:27 -07:00
82eb18fce5
Expanded tabs in cmake files
2009-07-10 11:09:54 -07:00
be673a3816
Oops, copy/paste error in the llviewercontrol.cpp file top level comments.
2009-07-10 10:47:13 -07:00
e5efce3b4e
Fix line ending badness in LLViewerControl.
2009-07-10 10:28:56 -07:00
24be0ba83c
Fix Linux build error due to F32/S32 conversion warning. Not reviewed.
2009-07-10 03:14:23 +00:00
9e399d5d3c
Brad already added the LLCOMMON_LINK_SHARED definition. I removed the broken one I added and set the other one to ON by default.
2009-07-09 19:51:28 -07:00
c9caa217a9
Added LLDispatchListener implementation for gSavedSettings.
2009-07-09 18:41:45 -07:00
f35bb882c2
Added a requestReshape handler to LLViewerWindowListener.
2009-07-09 18:36:22 -07:00
91f9835176
DEV-35118 Converted voice volume feedback icon on bottom tray to use real artwork. Converted LLOutputMonitorCtrl to use ParamBlocks to specify art. Added output_monitor.xml to specify art. Bottom bar gives volume feedback even when triggering voice with middle-mouse or keyboard binding. Reviewed with Richard.
2009-07-10 00:23:41 +00:00
632da0b99e
Defaulting LLCommonLinkShared to on
2009-07-09 17:20:19 -07:00
725de557ec
Merge of mani's changes... and who knows what. Mercurial wanted a merge, but I had no changes
2009-07-09 17:11:45 -07:00
b5fef75dad
Moveing around DLL copying to support building llcommon.dll and using llcommon.dll while running unit tests.
2009-07-09 17:03:20 -07:00
bc852ca927
Line ending changes and Build Params changes from login-api-svn-1
2009-07-09 16:18:04 -07:00
e8bc8264f9
merge fix for bottom tray history button
2009-07-09 22:54:57 +00:00
d5211482b2
Oops, commented out lines slipped through my commit.
2009-07-09 22:40:15 +00:00
b742355130
DEV-35167 Reference counted selection objects were being kept around by floaters that were being constructed, but weren't visible. Reviewed by Richard.
2009-07-09 22:35:39 +00:00
ee24bbdd48
DEV-34804 right click object more>attach HUD, hover and a black bar appears
...
reviewed by Austni
2009-07-09 22:31:17 +00:00
8016e73cc0
svn merge -r126726:126727 svn+ssh://svn.lindenlab.com/linden/branches/skinning/skinning-15/
...
DEV-35109 Nav bar does not record teleports taken by any method other than typing into nav bar
DEV-35117 Hard to open local chat, needs bottom bar widget for now
hiding test IM floaters
2009-07-09 22:30:15 +00:00
4cbf65be95
DEV-35127 Text placement in an input box is uncomfortably low. Changed UILineEditorVPad default, pushed up the bottom of selection highlight by 1 pixel. Initialized a couple of variables in constructor. Trivial, not reviewed.
2009-07-09 22:02:14 +00:00
e65b6d9695
DEV-34822
...
svn merge -c120157 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab-viewer/giab-viewer-2
2009-07-09 21:45:04 +00:00
7a64aad1de
DEV-34822 - merge 1.23
...
merge -r119443 - basic slurl handling
ignore dead branch
2009-07-09 20:56:23 +00:00
Roxie Linden