Steven Bennetts
9e2cb2f4a0
DEV-38942 Eliminate startModal() from LLModalDialog
...
Also moved TOS and Critical floaters to login debug menu for testing
2009-08-28 08:04:26 +00:00
Monroe Williams
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Adam Moss
71344b233d
svn merge -c-131881 .
...
back-out DEV-32831
it annoys install.py but goodness knows why.
2009-08-27 08:51:31 +00:00
Adam Moss
dcfb520c56
DEV-32831 Win32: freetype 2.3.9 upgrade
...
patch by brad.
2009-08-27 08:08:57 +00:00
Steven Bennetts
71d48254e8
EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPosition
2009-08-26 23:46:04 +00:00
Steven Bennetts
af98aad98d
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
...
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-26 20:47:27 +00:00
Kent Quirk
6a364e6f32
DEV-37428 - add adult_compliant flag to startup sequence so that 2.x viewer properly identifies itself as capable of handling the adult information.
2009-08-26 19:39:53 +00:00
Richard Nelson
7e0f7a0193
attempt at fix for windows build error
...
reviewed by James
2009-08-24 23:50:37 +00:00
Richard Nelson
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
Adam Moss
c2619694fd
Some linux updater warning fixes for fussy futuristic gcc versions!
2009-08-24 15:37:31 +00:00
Adam Moss
c3cbd04985
svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6
...
QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-08-21 21:52:21 +00:00
Christian Goetze
87be6648d5
Applied path from "[sldev-commits] r2604 - projects/2009/snowglobe/trunk/indra/newview"
2009-08-20 21:16:18 +00:00
Leyla Farazha
06b079a24b
EXT-580 Add Friend button in the IM floater not disabled if already friends
...
EXT-579 Add Friend from the Im floater opens multiple invitation dialogs
sidebar should be up above bottom tray
reviewed by richard
2009-08-20 00:21:14 +00:00
James Cook
6bcf7a6fe6
EXT-592 IM chat is not updated for the first text message. PE added LLIMFloater::toggle() to show and hide the IM window when chiclets were clicked. This was not invoking the custom logic in LLIMFloater::show() that causes the message list to update. Reviewed with Leyla.
2009-08-19 18:43:46 +00:00
Steven Bennetts
b4f174f918
EXT-591 Create an Object (Build tool) will crash viewer
...
EXT-599 Time of the sent messages is '00-00' in the Group chat
EXT-598 Acquired/created date for all landmarks is 01/01/1970
2009-08-19 18:13:37 +00:00
Erica Olsen
3687ea869d
DEV-38250 Remove temporary preferences tab and organize advanced options
2009-08-18 22:58:21 +00:00
Bradley Payne
50f732bc01
For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled.
2009-08-18 20:18:40 +00:00
Richard Nelson
a7adfe132e
DEV-38131 "Drop down boxes with text entry ignore the text in the entry field"
...
reviewed by James
2009-08-18 18:46:43 +00:00
Palmer Truelson
75834b6490
Dev-36747
...
bump down 9700M and add new nvidia cards
no code changed
2009-08-18 17:49:03 +00:00
Steven Bennetts
0710d0da2b
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3
...
EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
2009-08-18 16:54:34 +00:00
Loren Shih
ac1b723fd7
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
This merges in all appearance side panel bug fixes.
2009-08-18 15:34:09 +00:00
James Cook
d53725ece1
EXT-549 Viewer crash when attempting to close detatched top menu. LLTearOffMenu wasn't registering its closeTearOff method because postBuild() isn't called because it isn't built from XML. Moving registration of closeTearOff to the constructor fixes it. Discussed with Steve, but not reviewed formally.
2009-08-18 00:43:56 +00:00
James Cook
22fef0515f
EXT-495 IM windows don't autoscroll. Added track_bottom param to floater_im_session.xml text editor, as I believe there is an implicit reshape happening in the dialog. Also made the divider lines showing usernames for each IM suppress duplicates, more like local chat history. Reviewed with Leyla.
2009-08-18 00:05:35 +00:00
Leyla Farazha
8089e12b86
EXT-547 Loosing focus on an IM window looses typed entries
...
and a fix for undocked im windows not closing when we open another im window
reviewed by james
2009-08-18 00:03:33 +00:00
Leyla Farazha
733e86c1fc
EXT-519 Moving the cursor over a modal dialog dings every time
...
EXT-471 Usernames do'g appear in the communicate window
reviewed by steve
2009-08-17 19:08:56 +00:00
Steven Bennetts
36e932b4d8
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1351 https://svn.aws.productengine.com/secondlife/pe/stable-1@1365 -> viewer-2.0.0-3
...
EXT 451 EXT-303 EXT-367 EXT-367 EXT-371 EXT-394 EXT-494 EXT-502 EXT-503 EXT-516 EXT-538 EXT-540
2009-08-17 17:02:48 +00:00
Steven Bennetts
1c7e298e21
Reverted accidental experimental change from last checkin.
2009-08-17 16:17:29 +00:00
Steven Bennetts
6a4897db5a
Significant optimization to LLUIString.
2009-08-17 16:15:53 +00:00
Steven Bennetts
6b31bc7229
EXT-490 Voice device settings unsaved
...
EXT-466 Statistics window is empty
EXT-488 Minimap does not open
2009-08-15 00:45:43 +00:00
Steven Bennetts
3b65da1fad
merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
...
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
2009-08-14 22:40:13 +00:00
Steven Bennetts
73caee4208
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
...
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
2009-08-14 21:50:02 +00:00
Steven Bennetts
1db494f58a
* Added a few safety checks to LLScrollContainer
...
* Minor change to LLIMView so that IM windows don't get hidden after they are displayed
* Changed default action for avatar list to be IM as per spec
* Fixed merge of home tab from avatar code.
2009-08-14 01:15:46 +00:00
Steven Bennetts
61ae45fb80
Tiny change to add a temporary keyboard shortcut for Active Speakers
2009-08-13 18:21:33 +00:00
Loren Shih
ed351ca913
For DEV-37955 : Broken links possible if linked item is cached but baseobj not cached
...
Major fix to guarantee no broken links. If a link comes through from the cache but its baseobj doesn't also exist in the cache, then don't add the link to memory yet, and uncache the folder.
Reviewed by: Nyx, Vir.
2009-08-13 16:05:07 +00:00
Steven Bennetts
953aec0613
More merge fixes (side panel merge issue)
2009-08-13 05:50:56 +00:00
Steven Bennetts
2ac24047df
Skinning merge fix plus missed files.
2009-08-13 05:32:26 +00:00
Steven Bennetts
faafa7405f
merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3
...
* EXT-449 EXT-131 EXT-464
* People and Places panel layout changes
* Some I18N fixes, test language
* Updated group panels following proposed new design
* made ims easier to read by color coding
2009-08-13 04:40:19 +00:00
Loren Shih
238b9a2e81
For DEV-37907 : Goto item should scroll inventory view to baseobj
...
Simple fix to scroll the inventory panel to show a folder if you select "Goto Link" from a folder link.
2009-08-13 00:48:49 +00:00
Steven Bennetts
efd58603da
reverting changes from 130124 - suspected cause of Mac crashes during login.
2009-08-12 22:05:37 +00:00
Loren Shih
5f92e2cf5a
For DEV-37895 : New icons for outfit folders
...
Icons existed already, but they were not added to textures.xml.
2009-08-12 21:54:41 +00:00
Loren Shih
f83601c180
For DEV-37866 : Crash when creating a new look b/c of non-existent attachments
...
Simple fix -- added NULL check to logic that processes attachments.
2009-08-12 19:53:45 +00:00
Loren Shih
7bbc5cdea6
svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification
This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-08-12 19:03:20 +00:00
Steven Bennetts
0bf4b5f222
merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
...
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
2009-08-12 01:12:27 +00:00
Steven Bennetts
8d7e56f219
Fixed bogus "changed skin" notification when closing preferences.
2009-08-11 07:34:17 +00:00
Steven Bennetts
caa367e5d4
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
...
EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261 I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897 Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
2009-08-11 06:37:35 +00:00
Xiaohong Bao
0984822b3e
extend alpha mask calculation to GL_UNSIGNED_INT_8_8_8_8 and GL_UNSIGNED_INT_8_8_8_8_REV. also fix EXT-389: clean up warnings: Cannot analyze alpha for image with format type 8035.
2009-08-11 01:56:56 +00:00
Steven Bennetts
7caae9f3e7
EXT-260 - I18N: the term 'Geek' is hard to translate
...
EXT-404 - Make Debug and Develop menus based on QAMode
Test:
* Advanced menu should be toggled based on ctrl-alt-D (as before)
* 'Advanced > Debug (QA) Mode' (ctrl-alt-Q) should now toggle the Advanced and Debug menus
* God Mode (ctrl-alt-G to enable, ctrl-shift-G to disable) should toggle the 'Admin' menu, but *only* when the 'Advanced' menu is visible
2009-08-11 01:34:57 +00:00
Steven Bennetts
ad04dcc19d
DEV-35969 - notecards opened from object inventory are blank
...
Also changed notecard previews to only have a "Save" button; "Keep/Discard" behavior has been deprecated.
2009-08-11 00:47:46 +00:00
Steven Bennetts
6da2295761
Small change to disable echoing chat and IM to the "console" (2d text overlay in the 3D window) in 2.0.
2009-08-10 16:05:28 +00:00
Steven Bennetts
8c6748bddb
EXT-5 - 'Press ESC' doesn't leave mouselook mode
2009-08-10 06:09:38 +00:00