Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
callum f923f896bc client changes to work with new version of Qt (4.6) and to do some cleanup at plugin exit so that cookies more betterer than what they did before. 2009-12-15 17:50:16 -08:00
James Cook b030bb6e55 Merge 2009-12-15 17:10:53 -08:00
James Cook 1bb4c9e1c9 EXT-3446 Manage Telehub floater opens below buildtools
Took out custom positioning code, set left edge to 300 in XML
2009-12-15 17:09:35 -08:00
Rick Pasetto fc40740e1e Add a PrimMediaMasterEnabled debug flag to allow us to disable the media data client
Conceptually reviewed by Monroe
2009-12-15 17:04:09 -08:00
richard cda1598fd6 fixed enter not performing login 2009-12-15 16:54:32 -08:00
Mark Palange (Mani) f92030d548 Yet again adding missed dependecies to the viewer copy command. 2009-12-15 16:31:59 -08:00
Leyla Farazha 4428d4039f merge 2009-12-15 16:27:43 -08:00
Leyla Farazha b76c439983 EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time options
EXT-2649 [BSI] Confirm on Drop
EXT-3416  Can't name a new gesture on creation (and renaming is HARD)
reviewed by James
2009-12-15 16:25:11 -08:00
Loren Shih 073ec70829 automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-15 19:20:03 -05:00
Loren Shih 4d4406820b automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-15 19:17:30 -05:00
Loren Shih a162d6afda EXT-3304 : Can't reorder items in the Favorites accordions
Fixed a bug where addChangedMask(LLInventoryObserver::SORT) was being called before the new sort order was established.

--HG--
branch : avatar-pipeline
2009-12-15 19:16:42 -05:00
Erica 679983b33b EXT-3484 Create Notice button is illegible (old label was overriding art) 2009-12-15 16:05:37 -08:00
James Cook dcf3e8884d EXT-3494 Sanitize floater show versus toggle
Eliminated legacy "ShowFloater" method in favor of Floater.Show and
Floater.Toggle.  Wrote new custom show methods where needed.
Reviewed with Leyla.
2009-12-15 15:59:16 -08:00
Lynx Linden e7eae45390 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-12-15 23:53:41 +00:00
Lynx Linden a575816d17 merge 2009-12-15 23:53:03 +00:00
Lynx Linden 931591c0ab EXT-3496: Add a common authentication key for search and home.
Search and the Home sidetray now have their own specific
authentication keys that they support from login.cgi, but they
fallback to a common key as follows:

Search: "search_token", fallback to "auth_token"
Home: "home_sidetray_token", fallback to "auth_token"
2009-12-15 23:45:38 +00:00
Mark Palange (Mani) 9d4c0c28a3 Added missing dependecies to the viewer manifest copy target. 2009-12-15 15:25:09 -08:00
skolb eb6b69640e Merge 2009-12-15 15:20:26 -08:00
skolb 90d7c2ec13 Merge 2009-12-15 15:19:57 -08:00
Lynx Linden dec9e56afe EXT-3180: Update Home sidetray to temporary URL. 2009-12-15 23:18:42 +00:00
Rick Pasetto 23760a63a0 merge 2009-12-15 14:59:02 -08:00
Runitai 1f8ad2651d Merge 2009-12-15 16:53:29 -06:00
Runitai a81a2f19b2 EXT-3488 Fix for sky not being reflected in water any more. 2009-12-15 16:47:48 -06:00
Steve Bennetts 88a146e0bb Merge 2009-12-15 14:46:00 -08:00
Steve Bennetts 710d2a6db3 Fixed an edge case that was triggering an error check when doing HTTP texture fetches. 2009-12-15 14:44:41 -08:00
Brad Payne (Vir Linden) 2dd09062d1 menu separator fix
--HG--
branch : avatar-pipeline
2009-12-15 17:33:59 -05:00
Rick Pasetto e62ee60e11 merge 2009-12-15 14:32:32 -08:00
Rick Pasetto aba3d46fb4 merge 2009-12-15 14:32:01 -08:00
Brad Payne (Vir Linden) e92a88159c For EXT-3448: New attachments detach after relog. Added a check that the only objects deleted by LLAppearanceManager are links. Probably not the cause of disappearing objects in this bug, but a good safety feature.
--HG--
branch : avatar-pipeline
2009-12-15 17:29:05 -05:00
richard 699e2e027b added "value" attribute to radio_items to better support arbitrary data selection
moved LLRadioCtrl to internal implementation of LLRadioGroup
reviewed by Leyla
2009-12-15 14:21:04 -08:00
Mark Palange (Mani) bff2f1d6f0 EXT-3140 and build performance enhancements.
Move the message_template check and manifest checking to the package step.
Moved the dll copy from a post-build step its own target for dependency checking.
Disabled copy of art/xui, etc in viewer manifest for non-package builds.
2009-12-15 14:19:33 -08:00
Rick Pasetto 9cf8c3e654 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/ 2009-12-15 14:05:16 -08:00
Leyla Farazha 5242a31b5d merge 2009-12-15 13:48:01 -08:00
James Cook cb5935fd1b EXT-3438 Current location in the Teleport History isn't bolded
Simple XML change
2009-12-15 13:42:53 -08:00
skolb dc9a62b5ab Merge 2009-12-15 13:31:18 -08:00
skolb 589472a4e9 Merge 2009-12-15 13:30:39 -08:00
Eric M. Tulla (BigPapi) 89a8182c2c Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-15 16:21:10 -05:00
Eric M. Tulla (BigPapi) eafd52200d fix for post merge compile error (minor) 2009-12-15 16:20:17 -05:00
Brad Payne (Vir Linden) 109de76574 merge
--HG--
branch : avatar-pipeline
2009-12-15 16:12:24 -05:00
Ramzi Linden 0f5a757540 L10N: some legacy strings were left in panel_preferences_setup.xml. At least I will make them consistent. 2009-12-15 13:12:16 -08:00
Brad Payne (Vir Linden) 0905d85761 For EXT-3448: New attachments detach after relog. This fixes the most common problem, failing to create COF link to new attachment.
--HG--
branch : avatar-pipeline
2009-12-15 16:10:29 -05:00
Samuel Kolb d7533a2c06 merge 2009-12-15 13:05:47 -08:00
Samuel Kolb c2554b6f28 merge 2009-12-15 13:05:35 -08:00
James Cook 1dcea4cb14 EXT-3406 choosing About Land from parcel context menu toggles window
Fixed to just show the window.
2009-12-15 13:04:38 -08:00
Eric M. Tulla (BigPapi) 08495d3f63 Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-12-15 15:41:51 -05:00
Monroe Linden 1f7bf92168 New mac build of llqtwebkit.
This build is based on the following:

http://bitbucket.org/girish/llqtwebkit-4.6/
	revision 08c337619f50
	local change: comment out the definition of qt_sendSpontaneousEvent() in llembeddedbrowserwindow.cpp

git://gitorious.org/~girish/qt/girishs-qt.git
	branch lindenqt
	revision b4820037eac5c52d44df99ec37a50edd1796c897
2009-12-15 12:41:20 -08:00
richard 6d36fad38a EXT-3478 - crazy scrollbars in profile when user has a long name 2009-12-15 11:28:28 -08:00
Loren Shih fbf5d1a992 EXT-3304 : Can't reorder items in the Favorites accordions
EXT-3476 : Dragging and item in the PlacesSP brings up the InventorySP
EXT-1916 : Landmarks are not sorted in the Favorites Accordion

Added a new LLInventoryObserver::SORT request for resorting folder contents.
Landmarks no longer use the same sorting as accordions.

--HG--
branch : avatar-pipeline
2009-12-15 13:47:31 -05:00
Samuel Kolb 82425a230c Merge 2009-12-15 10:05:42 -08:00
James Cook 27415d27a3 Merge 2009-12-15 09:56:44 -08:00