summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-08-13merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3Steven Bennetts
* 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-13For DEV-37907 : Goto item should scroll inventory view to baseobjLoren Shih
Simple fix to scroll the inventory panel to show a folder if you select "Goto Link" from a folder link.
2009-08-12reverting changes from 130124 - suspected cause of Mac crashes during login.Steven Bennetts
2009-08-12For DEV-37895 : New icons for outfit foldersLoren Shih
Icons existed already, but they were not added to textures.xml.
2009-08-12For DEV-37866 : Crash when creating a new look b/c of non-existent attachmentsLoren Shih
Simple fix -- added NULL check to logic that processes attachments.
2009-08-12svn merge -r129617:130277 ↵Loren Shih
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-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 ↵Steven Bennetts
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-11Fixed bogus "changed skin" notification when closing preferences.Steven Bennetts
2009-08-11svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3Steven Bennetts
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-11extend alpha mask calculation to GL_UNSIGNED_INT_8_8_8_8 and ↵Xiaohong Bao
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-11EXT-260 - I18N: the term 'Geek' is hard to translateSteven Bennetts
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-11DEV-35969 - notecards opened from object inventory are blankSteven Bennetts
Also changed notecard previews to only have a "Save" button; "Keep/Discard" behavior has been deprecated.
2009-08-10Small change to disable echoing chat and IM to the "console" (2d text ↵Steven Bennetts
overlay in the 3D window) in 2.0.
2009-08-10EXT-5 - 'Press ESC' doesn't leave mouselook modeSteven Bennetts
2009-08-07Command: Merging from ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra, revision 1245 to https://svn.aws.productengine.com/secondlife/pe/stable-1/indra, revision 1246 into P:\svn\viewer-2-0\latest\indra, ignoring ancestry * EXT-277 - Modifications to the Location Bar Context Menu * EXT-252 - /whisper, /shout * EXT-254 - IM chiclet counter * EXT-267 - 'Status' drop-down menu doesn't drop in the Side tray / Me panel * EXT-298 - Update Places Panel Spec to reflect latest Create Landmark format * EXT-278 - Input Field History should display human readable names * EXT-317 - Avatar profile isn't opened in the sidetray as Profile Info panel when selecting an avatar in the search * Changes to notification tips * Changes to movement and camera controls * Side Tray functionality additions and code cleanup
2009-08-07EXT-295 - Added script to generate application config file. Reviewed by PoppyMark Palange
2009-08-05merge -r 129526 skinning-19 -> viewer-2.0.0-3Steven Bennetts
Cherry pick a fix to enable IM windows.
2009-08-05EXT-316 Enable the Viewer to generate calling cards for any agentSteven Bennetts
Added code to store agent ID in the description field of calling cards so that we can use them to store user generated contacts. Currently enabled as a context menu for avatars (just for initial testing). reviewed by richard
2009-08-04Fix for a crash bug on login after clearing the cache.Steven Bennetts
2009-08-04fix for broken buildRichard Nelson
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-03merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 QA: New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing. Many other changes to the bottom bar. Changes to local chat behavior.
2009-07-31for DEV-33077 partially: don't call analyzeAlpha for media textures.Xiaohong Bao
2009-07-31Minor change to protect against odd case where mArrowImage was NULL (unclear ↵Steven Bennetts
why it's happening, but the extra checks are not a bad thing).
2009-07-31Re-added volume column to panel_people.xml (lost in XUI cleanup).Steven Bennetts
2009-07-30merge ↵Steven Bennetts
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-27DEV-36783 I18N: important .on_click and .on_enable widgets are missing a ↵Ramzi Ramey
name= parameter. This breaks localization. Fixed in en and fr (as 1 test case)
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵James Cook
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-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-24svn merge -r 127369:127511 ↵Loren Shih
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-24Merge in disabling of universal builds.Brad Kittenbrink
PPC is now oficially deprecated. svn merge -r 127807:128098 svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
2009-07-23svn merge -r 127683:128178 ↵Loren Shih
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-21I18N fix: more nodes in XUI have duplicate name= parameters. This breaks ↵Ramzi Ramey
localization.
2009-07-21DEV-34977 Context menu fails to open in Build mode. Product Engine ↵James Cook
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-21merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r ↵Steven Bennetts
1078-1091 -> viewer-2.0.0-3
2009-07-21merge ↵Steven Bennetts
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-17DEV-35770 I18N: all <combo_box.item> are missing a name= parameter.Ramzi Ramey
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-17six instances of Alpah -> AlphaAdam Moss
2009-07-17Eliminated old (stale) llinventoryview.cpp and merged changes to it into ↵Steven Bennetts
llfloaterinventory.cpp.
2009-07-16add a flag in LLImageGL to turn off calling LLImageGL::analyzeAlpha() and ↵Xiaohong Bao
LLImageGL::updatePickMask().
2009-07-16make LLViewerTextureManager::staticCastToFetchedTexture to accept NULL ↵Xiaohong Bao
pointer as input.
2009-07-16I18N fix: some nodes in XUI have duplicate name= parameters. This breaks ↵Ramzi Ramey
localization.
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
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-15svn merge -r 127173:127174 ↵Monroe Williams
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-15Revert rev 126736 for DEV-35109 which made location history in nav bar show ↵James Cook
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-15Fixed compile warnings in llmath/llrect.h. This header is now included in a ↵Martin Reddy
unit test in indra/test where warnings are treated as errors.
2009-07-15DEV-35500: Write new llmath unit testsMartin Reddy
- 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-15Fixing DEV-35175 regression.Leyla Farazha
Context Windows will now spawn up if too far down, and spawn left if too far right. reviewed by James
2009-07-14Merge skinning-15 to viewer-2. Fixes include:James Cook
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-14QAR-1602 checkpoint for multiple texturesNeal Orman
Fixing merge problems - updating LLLocalTextureObject (new class) to work with Bao's texture refactoring. -Nyx