Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Leyla Farazha ab93c0ffb5 EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav and/or Favorites Bar are Hidden
EXT-3334 	 [BSI] Chat/IM log preferences not retained
EXT-3402 	 Replace "X" for checked menu items with a check mark glyph [Patch Included]
reviewed by richard
2009-12-17 16:15:46 -08:00
James Cook 9cd338c1f3 Merge 2009-12-17 16:11:01 -08:00
James Cook 6e17110201 EXT-3516 X Button should end IM session, _ button should hide
I don't like it, but I don't have a better suggestion.
Reviewed with Steve.
2009-12-17 16:09:41 -08:00
Loren Shih 6580d70412 dos2unix line ending fix for llviewermenufile.cpp
--HG--
branch : avatar-pipeline
2009-12-17 19:09:37 -05:00
Loren Shih 36634bc1ec automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-17 18:55:01 -05:00
Loren Shih 6b065789c0 automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-17 18:53:01 -05:00
Loren Shih 03c75c22f9 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
"Delete" no longer works for system folders.
Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected.

--HG--
branch : avatar-pipeline
2009-12-17 18:47:58 -05:00
Justin C. Rounds (Chuck) 45f8ced1df Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/ 2009-12-17 18:27:03 -05:00
Justin C. Rounds (Chuck) 68a71ddb48 Started clean-up of appearance floater layout. 2009-12-17 18:25:43 -05:00
Steve Bennetts 74b36a4cf1 revert -3 6510 sidepanel_item_info.xml 2009-12-17 15:24:04 -08:00
Erica 8c3da4f43f Automated merge with ssh://hg.lindenlab.com/james/gooey 2009-12-17 15:02:13 -08:00
Erica d1211da0b5 EXT-3555 Top menu no longer changes color when in God mode, Button height unsquooshing from Lis 2009-12-17 15:00:31 -08:00
Sergey Borushevsky 78d48def6b Fixed normal bug EXT-637 (Please, add tooltips with a full names of the landmraks in the Favor bar / Overflow menu)
Fixed problem with overlapping of tool tip by menu.

--HG--
branch : product-engine
2009-12-18 00:45:35 +02:00
James Cook 8a7f2ce811 Merge 2009-12-17 14:28:23 -08:00
James Cook 907741ad1b EXT-3508 Animation : preview play / stop button does not refresh preview
Moved all play/pause button visibility code into the refresh() method.
Reviewed with Leyla.
2009-12-17 14:27:31 -08:00
Tofu Linden 25861bb374 add newline to unbreak linux build. probably. 2009-12-17 14:15:50 -08:00
Rick Pasetto f8f9e5a7fb merge 2009-12-17 13:53:44 -08:00
Rick Pasetto cf4c511733 Change "url prefix" to "url pattern" 2009-12-17 13:50:48 -08:00
Nyx (Neal Orman) bad019313a Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-12-17 16:27:14 -05:00
Nyx (Neal Orman) 9abe3c5814 EXT-3551 make outfit functionality non-discoverable
removed + button, added make outfit button.
make outfit button is only enabled if the "my outfits" tab is selected.

Code reviewed by Vir

--HG--
branch : avatar-pipeline
2009-12-17 16:26:04 -05:00
Loren Shih 49cb11010e automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-17 16:05:52 -05:00
Loren Shih d3d454988a EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items in the folder
Now checking contents of the folder for any actively worn items for determining this flag.

--HG--
branch : avatar-pipeline
2009-12-17 15:47:07 -05:00
Loren Shih 1f750b2066 pe -> viewer2.0 merge 2009-12-17 15:25:34 -05:00
Loren Shih 3c38c7f148 EXT-1634 : Block collapse/expand of accordion "root" folder by keyword
Hidden folders are no longer allowed to be selected.

--HG--
branch : avatar-pipeline
2009-12-17 15:21:14 -05:00
Monroe Linden 3f165e1766 Turned debug spam in LLViewerMedia::isInterestingEnough() down to lldebugs. 2009-12-17 12:11:23 -08:00
Monroe Linden 2475335994 Rearranged the handling of error status codes in LLMimeDiscoveryResponder. We should now deal with many more classes of subtly misbehaving web servers, and will use the returned MIME type for 4xx errors instead of guessing text/html. 2009-12-17 12:08:44 -08:00
James Cook 7755f70836 EXT-3535 Don't show the tutorial on first log-in
Discussed with Esbee and Howard - we're not doing a web-based
tutorial.  If we want it back, we'll have to do another viewer
release.
2009-12-17 12:06:29 -08:00
Rick Pasetto 20e51aa3aa Quiet some logging, make sure if 1024 is lowest we still load it 2009-12-17 11:52:15 -08:00
richard c84b6a28a0 made setupParams do coordinate flipping and negative coordinate magic only for XUI-based params 2009-12-17 11:49:41 -08:00
richard 7a3034f738 replaced llsd_equals with string based llsd comparison for more consistent support 2009-12-17 11:48:57 -08:00
richard c89bb9848f fix for bad xui warnings when loading font from legacy "resource" name 2009-12-17 11:48:33 -08:00
richard 4ec3186842 fixed some bad xui params 2009-12-17 11:47:51 -08:00
richard 298b1ad6d9 made color_swatch border color consistent 2009-12-17 11:47:13 -08:00
richard 49a037048c oops, forgot to remove assert 2009-12-17 11:44:37 -08:00
richard 9abe9bf5df clamp instead of assert when running out of room during reflow 2009-12-17 11:44:01 -08:00
skolb 967652a705 Merge 2009-12-17 11:39:35 -08:00
Monroe Linden 0f7e49dea1 Set an explicit "Accept" header when doing the MIME type probe. This prevents LLHTTPClient from adding an "Accept: application/llsd+xml", which is just wrong. 2009-12-17 11:11:45 -08:00
Monroe Linden 1f377c6b53 Made LLPanelLogin tell the browser plugin to clear its cache before opening the login screen.
Added clearCache() functions to LLViewerMediaImpl and LLMediaCtrl to facilitate this.
2009-12-17 11:10:03 -08:00
Eric M. Tulla (BigPapi) 39700f104b Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-17 13:45:13 -05:00
Eric M. Tulla (BigPapi) 27fda6c35f EXT-2636: we now show "Loading..." before the my inventory named folder when doing a background fetch. 2009-12-17 13:40:57 -05:00
Brad Payne (Vir Linden) c3522ef0ce merge
--HG--
branch : avatar-pipeline
2009-12-17 13:16:17 -05:00
Brad Payne (Vir Linden) bc2b796811 For EXT-3500: Make InventorySP and AppearanceSP filters behave like it does in LandmarksSP and PeopleSP. This covers AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-17 13:07:16 -05:00
richard 724f5fbb7f merge 2009-12-17 10:03:56 -08:00
richard 9ff869a6b2 Backed out changeset: 4d482c1ed041 2009-12-17 10:01:55 -08:00
richard cf63ce4dc1 merge 2009-12-17 09:57:43 -08:00
richard f452c01915 EXT-3087 - Crash when avatar icon truncated in interactive notifications
reviewed by Mani
2009-12-17 09:54:44 -08:00
skolb c9a70e8675 Merge 2009-12-17 09:38:52 -08:00
skolb cbbd8dcf22 local merge 2009-12-17 09:28:49 -08:00
skolb f713efe298 Merge 2009-12-17 09:26:33 -08:00
Igor Borovkov de3c63c339 merge
--HG--
branch : product-engine
2009-12-17 19:07:52 +02:00