e97f7728a9
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-30 23:22:41 +00:00
d5aa10143a
DEV-36783 I18N: important .on_click and .on_enable widgets are missing a name= parameter. This breaks localization.
...
Fixed in en and fr (as 1 test case)
2009-07-27 22:43:43 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
ca51e8f33d
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
...
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-27 16:50:01 +00:00
f5ba6df4c2
svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames
For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER]
For DEV-36563 : Remove mAcceptsCallingCardNames
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects.
* Test creating landmarks.
Test plans - INTERNAL
* Test against any inventory permissions smoke tests.
* See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
2009-07-24 16:20:15 +00:00
be7e9a46db
Merge in disabling of universal builds.
...
PPC is now oficially deprecated.
svn merge -r 127807:128098 svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
2009-07-24 01:31:53 +00:00
363de6c3bc
svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types. Test inventory operations on these folder types.
Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan.
2009-07-23 23:41:12 +00:00
80deb2a535
I18N fix: more nodes in XUI have duplicate name= parameters. This breaks localization.
2009-07-21 23:47:37 +00:00
9ad6434bb7
DEV-34977 Context menu fails to open in Build mode. Product Engine implemented context menus as spawning on right-mouse-up, which interacts poorly with LLToolPie and recycled pie menu code. Changed context menu spawn to right-mouse-down, which allows click-drag-select behavior like the Mac. Eliminated unnecessary LLContextMenu::handleMouseUp and handleMouseDown methods -- these are handled in the LLMenuGL base class. Added handleRightMouseUp to LLMenuHolderGL to hide menus on right-mouse-up outside the menu. Reviewed with Richard.
2009-07-21 19:00:58 +00:00
cef46d1645
merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3
2009-07-21 00:59:14 +00:00
73a97010e6
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-21 00:57:23 +00:00
dedb5be906
DEV-35770 I18N: all <combo_box.item> are missing a name= parameter.
...
I put them back, using the original name= given in version 1.23, but in some cases I just renamed long lists with "item1", "item2", etc.
2009-07-17 23:06:53 +00:00
9ffb8addf7
six instances of Alpah -> Alpha
2009-07-17 07:32:06 +00:00
88126805c7
Eliminated old (stale) llinventoryview.cpp and merged changes to it into llfloaterinventory.cpp.
2009-07-17 01:27:44 +00:00
6a198eed3b
add a flag in LLImageGL to turn off calling LLImageGL::analyzeAlpha() and LLImageGL::updatePickMask().
2009-07-16 23:51:22 +00:00
4b1ce391d4
make LLViewerTextureManager::staticCastToFetchedTexture to accept NULL pointer as input.
2009-07-16 23:22:18 +00:00
e0179932d1
I18N fix: some nodes in XUI have duplicate name= parameters. This breaks localization.
2009-07-16 19:45:34 +00:00
0274c1f2b1
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
...
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
2009-07-16 17:54:58 +00:00
09d9b0556e
svn merge -r 127173:127174 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04
...
Cherry-picking a change to the code that uses the copy of skins in the development tree instead of the version in the app bundle on the mac.
Reviewed by James.
2009-07-15 23:16:09 +00: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
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
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
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
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00: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
24be0ba83c
Fix Linux build error due to F32/S32 conversion warning. Not reviewed.
2009-07-10 03:14:23 +00: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
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
7fbf5269e0
Don't show camera and movement control floaters on first-run to meet Movement/Camera spec. Trivial, not reviewed.
2009-07-09 18:55:46 +00:00
2c53a140d7
Fixed typos, "delite" for "delete". Trivial, not reviewed.
2009-07-09 18:45:22 +00:00
7c305304c8
DEV-35140 Time zone in menu bar is truncated. Simple layout issue, trivial, not reviewed.
2009-07-09 18:28:09 +00:00
4cea1c9d85
DEV-35114 - Changed IMToast notification to type "notifytoast" so it doesn't show up as a standard notification.
2009-07-09 07:57:53 +00:00
e88d41f44e
Cleaned up LLFloaterWorldMap a little to track down a crash... which appears to have gone away with the cleanup.
2009-07-09 07:49:11 +00:00
b90099b4b0
1. created prototype stand up button ins LLBottomTray
...
2. re-arranged LLFloaterReg::add alphabetically
to be reviewed
2009-07-09 07:00:30 +00:00
a994f3dbee
Missed a file
2009-07-09 03:49:10 +00:00
60ba000989
Fixed LLPanel visible and enabled settings.
...
Set the side panel width to 280.
Changed the code to use the initial width of the side tray instead of the max of the panels.
2009-07-09 03:40:30 +00:00
3df2f5e8c0
DEV-35153 - fix for ui scale breaking picking (pie menu etc) by normalizing world rect dimensions against ui scale
...
DEV-35154 - switching to fullscreen fails with bad resolution
reviewed by Brad
2009-07-09 02:18:29 +00:00
Steven Bennetts