Commit Graph

4307 Commits (9d4c0c28a384651ccf72fcd65c740538ae489ee3)

Author SHA1 Message Date
Mark Palange (Mani) 9d4c0c28a3 Added missing dependecies to the viewer manifest copy target. 2009-12-15 15:25:09 -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
Lynx Linden 9b4d09471c DEV-41317 DEV-42311: Improved auto-call implementation.
Improved the implementation for auto-connecting an adhoc call. This
involved having the controller (LLIMMgr) set a flag in the model
(LLIMModel) to autoconnect on initialize. Now all of the view code
(LLPanelChatControlPanel) and the signal/callback infrastructure that
I added earlier can be removed as it violated MVP separation. Ah!
Much nicer. Thanks to PE folk for the suggestion.
2009-12-10 14:05:17 +00:00
Lynx Linden 3497f64b12 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-12-10 09:20:33 +00:00
Steve Bennetts 562d343c47 EXT-3298 world map does not load simulator textures
Forgot to add LLCurl update call to non threaded LLTextureFetch update.
2009-12-09 18:18:01 -08:00
Mark Palange (Mani) d8d6a6d1b7 merge 2009-12-09 16:39:10 -08:00
Mark Palange (Mani) 9f68163179 EXT-2896 Fixed poor handling of login error.
Added more cleanup to the reset_login call.
Added new settings to control UseCircuitCode message timeouts to allow testing of this failure.
Reviewed by Richard
2009-12-09 16:38:37 -08:00
Tofu Linden 9abe779c8a last blind fixup for llmediaplugintest. 2009-12-09 14:55:45 -08:00
Tofu Linden 9b0825be5c get llmediaplugintest compiling on win32, dumbly. 2009-12-09 14:48:36 -08:00
James Cook ca2566a1ac Merge 2009-12-09 14:36:52 -08:00
Tofu Linden 05e0d9d24a Re-disable a very spewy debug spew in the webkit plugin. Mea culpa. 2009-12-09 14:36:45 -08:00
Erica 6dd56fddd7 Automated merge with ssh://hg.lindenlab.com/james/gooey 2009-12-09 14:34:45 -08:00
Erica 2a1e3b48f9 Crash fix due to bad duplicated attributes in xui 2009-12-09 14:34:26 -08:00
Tofu Linden 204ae550d8 blindly fix-up llmediaplugintest.cpp with respect to the recent API change. 2009-12-09 13:59:51 -08:00
Tofu Linden 2554a88ec1 merge! 2009-12-09 13:46:05 -08:00
James Cook 7466aa198a Merge 2009-12-09 13:42:07 -08:00
Lis Pardi 1c0b5d4435 Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2009-12-09 16:35:15 -05:00
Lis Pardi 3b36b1fd2a ext-2976 change "alerts" to read "notifications" 2009-12-09 16:35:05 -05:00
James Cook 6260ce6a92 Merge 2009-12-09 13:24:21 -08:00
Tofu Linden 2af183c51d remove LL_PATH_BROWSER_PROFILE
it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer.
2009-12-09 13:20:25 -08:00
James Cook 7193e97b98 Fix line endings. 2009-12-09 13:14:04 -08:00
James Cook 627bdb5bd4 Merge 2009-12-09 13:11:20 -08:00
Leyla Farazha 0c1d9da1c1 merge 2010-12-08 11:58:16 -08:00
Leyla Farazha 52dd4daada adding notes about visible / enable callback registries being merged 2010-12-08 11:56:44 -08:00
Leyla Farazha f4fd622686 EXT-2807 Update mini-inspector to include Group Voice Chat moderator controls
reviewed by Richard
2010-12-08 11:51:43 -08:00
Leyla Farazha 3b355848af merge 2010-12-07 13:41:38 -08:00
Leyla Farazha 27d6f0e49c EXT-3265 Gear menu on_visible params are broken - not setting visibility of menu items
EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2010-12-07 13:39:56 -08:00
James Cook 3476116de8 EXT-2827 and fix for delete key not deleting objects while building.
Object inventory was grabbing edit menu handling during refresh.
Put back Angela's code so that Right-click > Remove > Delete
is now disabled if you have a single face selected.  Fixed
LLSelectMgr::contains() for SELECT_ALL_TES case.
Reviewed with Richard.
2009-12-09 13:06:07 -08:00
James Cook e9bca5d52a EXT-2980 Remove indentation on back button history list.
Design reviewed with Lis
2009-12-09 13:02:51 -08:00
Tofu Linden 197de032e1 DEV-43948 viewer2 is writing session data into the 'read-only' installation tree (mostly media stuff)
propagate the parent app's OSUserAppDir (i.e. ~/.secondlife/) all the way down to plugins, if they need persistant user data/settings (like the webkit plugin needs a place to put its cache).
2009-12-09 12:57:10 -08:00
Loren Shih 883ef71722 automated merge 2009-12-09 15:42:07 -05:00
Loren Shih f7215a5d7c automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-09 14:53:12 -05:00
Loren Shih 96d5f52624 EXT-3274 : Landmarks or Favorites accordion panel shows up as empty
EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab

Forcing top-level folders open when accordion is active.  Removed logic that was saving and restoring initial folder state.

--HG--
branch : avatar-pipeline
2009-12-09 14:47:52 -05:00
Lynx Linden 363ee42d53 EXT-3234: Display notification when SLurl blocked/throttled.
We block or throttled certain SLurls when they came from an untrusted
browser. Previously this would happen silently (though a message was
sent to the logfile). Now we show a once-per-session notification if
either of these situations arise.
2009-12-09 18:44:01 +00:00
Tofu Linden 15fbfa5ae1 rename LL_PATH_MOZILLA_PROFILE to LL_PATH_BROWSER_PROFILE 2009-12-09 10:31:50 -08:00
Erica 5216304b2c Automated merge with ssh://hg.lindenlab.com/james/gooey 2009-12-09 10:07:07 -08:00
Erica a301e6dd5b merge - bad line endings 2009-12-09 10:06:06 -08:00
Lis Pardi 89c0fc48b2 ext-2981 button and text editor height schould be 23px, not 16px 2009-12-09 12:07:16 -05:00
James Cook a4dc0881aa Merge 2009-12-09 08:44:44 -08:00
Nyx (Neal Orman) 019fc57855 fix for linux build breakage, a LLPointer was being implicitly cast wrong
approved by Seraph

--HG--
branch : avatar-pipeline
2009-12-09 11:34:44 -05:00
Lis Pardi cefa8e4f54 EXT-2980 make back button in nav bar match spec 2009-12-09 11:28:56 -05:00
Nyx (Neal Orman) e6f1604549 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-12-09 11:16:43 -05:00
Nyx (Neal Orman) d75e1472c4 EXT-2819 crash in color picker in appearance editor
Made progress by writing code to match the style we use for the texture picker.
It now should not make a difference if you destroy the color picker floater or
the color swatch control first - either direction it should do sufficient cleanup
and protection. However, still getting this crash. Will investigate further later.

Code reviewed by Seraph

--HG--
branch : avatar-pipeline
2009-12-09 11:16:25 -05:00
Nat Goodspeed 2c0cea9017 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-09 10:22:40 -05:00
Nat Goodspeed adc975ff91 Reduce likelihood of indefinite wait in viewer integration tests.
Introduce LLStartupListener to allow viewerclient-based test script to query
startup state. This handles the scenario in which, by the time the test script
manages to connect, the viewer already IS in STATE_STARTED.
Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make
that wait time out eventually to deal with "System currently logging you off,
please wait 5 minutes." Timeout raises new ViewerWontLogin exception.
Fix testlangs to catch ViewerWontLogin and retry a limited number of times.
2009-12-09 10:20:08 -05:00
Erica ffca4ec568 Accordions in appearance panel don't use full space, removed borders in inventory panel, standardized button sizes, changed login according to feedback 2009-12-09 06:06:37 -08:00
Brad Payne (Vir Linden) cb88b7f4a4 merge
--HG--
branch : avatar-pipeline
2009-12-08 22:15:17 -05:00
richard be45239d00 merge 2009-12-08 18:43:57 -08:00
richard 7a05356749 EXT-2572 - Bottom text on bottom line in nearby chat is clipped 2009-12-08 18:43:32 -08:00
Ramzi Linden 92ca569b42 EXT-2702 the Group abilities 'Show in Find Places' is mislabeled.
Also updated various places that refer to the 1.23 style UI.
2009-12-08 17:30:58 -08:00