Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih 95bbee6b0e EXT-3527 : Centralize calls to getIsItemWorn
Changed more functions to use get_is_item_worn.

--HG--
branch : avatar-pipeline
2009-12-16 17:02:02 -05:00
Samuel Kolb d3ca545687 local merge 2009-12-16 13:57:11 -08:00
Samuel Kolb 0d0e085244 fixed indenting issue with viewer_manifest.py 2009-12-16 13:55:14 -08:00
Loren Shih 7796fc6748 EXT-3527 : Centralize calls to getIsItemWorn
Moved function from llinventorybridge to llinventoryfunctions.

--HG--
branch : avatar-pipeline
2009-12-16 16:36:40 -05:00
Loren Shih 66e7ca7c7a EXT-2524 : Disable ability to make links manually in non-god mode
Non-god mode treatment of copy/paste is now consistent with 1.23 behavior, and "paste as linK" doesn't show up in non-god mode.

--HG--
branch : avatar-pipeline
2009-12-16 16:11:53 -05:00
callum c50d86d370 Merge with tip 2009-12-16 13:10:25 -08:00
callum 6cb3d25942 Merge with tip 2009-12-16 13:10:03 -08:00
Loren Shih 12ad3e8fee viewer2.0->viewer2.0 merge 2009-12-16 15:28:27 -05:00
Loren Shih 2541072b06 Fix Windows build error due to tab issues in viewer_manifest.py. 2009-12-16 15:23:40 -05:00
Loren Shih 10de771316 product engine -> viewer2.0 merge 2009-12-16 15:07:50 -05:00
brad kittenbrink ed3bcac5dd Fix for another merge bug. 2009-12-16 12:07:19 -08:00
Samuel Kolb 3456bd5254 local merge 2009-12-16 12:04:46 -08:00
Samuel Kolb bedde40e94 local merge 2009-12-16 12:04:38 -08:00
Loren Shih a13be32d80 EXT-2435 : Advanced > Shortcuts > Fly is always ticked
Simple UI change to read gAgent.getFlying state.

--HG--
branch : avatar-pipeline
2009-12-16 15:00:07 -05:00
callum 4027788dfc Tweaks to XUI to make sure long urls are clipped in various dialogs. 2009-12-16 11:47:57 -08:00
brad kittenbrink 0c0cb6fd79 oops, fix for merge bug in newview/CMakeLists.txt 2009-12-16 11:24:46 -08:00
Nyx (Neal Orman) 9571dcfed6 EXT-3514 update debug settings for appearance
fixing layout issues with previous patch to avoid breaking the bottom buttons

reviewed by vir

--HG--
branch : avatar-pipeline
2009-12-16 14:23:58 -05:00
Rick Pasetto aee5dc6172 Enable OK button in media settings panel even if nothing is changed, but have it be a no-op
Review #63

This change addresses an issue where the OK button was greyed out even if nothing was different (changed) in the medias settings floater. This originally was implemented so that no "empty media" data would accidentally get added to the object. But that was confusing (the OK button should never be greyed out). This changes it so that apply() will simply be a no-op if the data has not changed, and now the OK button is always enabled.
2009-12-16 11:16:41 -08:00
brad kittenbrink 0efe9ec551 Merged mani's EXT-3140 and build performance enhancements work into viewer-2-0. 2009-12-16 10:54:52 -08:00
Loren Shih f87dcc28fa EXT-2760 : Double-clicking an Object in inventory opens the permissions in the side tray
Double clicking on an object no longer brings up both the floater and sidetray (it only brings up the sidetray now).

--HG--
branch : avatar-pipeline
2009-12-16 13:53:19 -05:00
Mike Antipov d2b0245d58 rename values to be more descriptive
--HG--
branch : product-engine
2009-12-16 20:43:12 +02:00
Nyx (Neal Orman) ee80fb64af merge with avp
--HG--
branch : avatar-pipeline
2009-12-16 13:33:49 -05:00
Rick Pasetto 52ab75d1e5 Undo previous change to this file. 2009-12-16 10:05:25 -08:00
Leyla Farazha 46f56f5d52 eof newline 2009-12-16 09:45:15 -08:00
Mike Antipov e921eac328 Fixed line endings to unix format
--HG--
branch : product-engine
2009-12-16 19:19:42 +02:00
Nyx (Neal Orman) ace0be2a7c merge with avp-tip
--HG--
branch : avatar-pipeline
2009-12-16 12:16:24 -05:00
Nyx (Neal Orman) 90bb29245c EXT-3514 update debug settings for new appearance features
following changes:
1) remove renderavatarinvisible - no longer need this debug setting
2) add showobjectrenderingcost (default:TRUE) so we can turn this feature off if necessary
3) add showdebugappearanceeditor (default:FALSE) so we can test the future appearance editor

code reviewed by vir and seraph

--HG--
branch : avatar-pipeline
2009-12-16 12:15:18 -05:00
Lynx Linden 9e36948a26 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-12-16 17:11:37 +00:00
Lynx Linden 5d7cb42360 EXT-3517: Update mic/speaker volume scaling.
We now scale the mic and speaker volume levels to the Vivox range 30
to 70 (default of 50), as recommended by Vivox for their V3 SDK.
2009-12-16 17:10:29 +00:00
Brad Payne (Vir Linden) 9813df87af merge
--HG--
branch : avatar-pipeline
2009-12-16 11:43:08 -05:00
Brad Payne (Vir Linden) adec0ba983 For EXT-3114: [BSI] Can't right click > edit a no-mod attachment
--HG--
branch : avatar-pipeline
2009-12-16 11:34:46 -05:00
Mike Antipov 0ec2bacfac Work on EXT-3431 Implement 'mute/unmute everyone else' moderation in the voice control panel
-- changed behavior of 'mute/unmute everyone else' action to disable/enable voice chat and allow/disallow selected participant
  Improvements to have more intellectual processing of several following requests is necessary

--HG--
branch : product-engine
2009-12-16 18:14:15 +02:00
Loren Shih 1e5f2f5d8c automated merge avp->viewer2.0 2009-12-16 10:14:18 -05:00
Mike Antipov 5370d9f35b Work on EXT-3431 Implement 'mute/unmute everyone else' moderation in the voice control panel
-- code refactored: moderator actions are moved from UI to IM Speaker Manager (and just called from UI).

--HG--
branch : product-engine
2009-12-16 14:44:55 +02:00
Vadim Savchuk d7002ad7c1 Merge from default branch.
--HG--
branch : product-engine
2009-12-17 12:26:10 +02:00
Alexei Arabadji 11adf324c7 implemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control
panel is opened”,
reverted changes from 6658:6a7714959726;
made LLCallFloater non-unique dockable;
added LLCallFloater to control list of Transient Manager;

--HG--
branch : product-engine
2009-12-17 11:46:02 +02:00
Lynx Linden 3eea3281af DEV-44351: Add a new secondlife:///app/classified/create SLapp.
Also cleaned up the code for the existing app/classified/{UUID}
support. Much nicer now.
2009-12-16 12:26:52 +00:00
skolb 88291b378e Merge 2009-12-15 22:05:21 -08:00
callum 966b2ebfe2 Misnamed additional Qt/WebKit DLL. 2009-12-15 21:02:16 -08:00
Rick Pasetto 4532611499 fix for llui unit test 2009-12-15 19:54:20 -08:00
richard 1a4047c590 merge 2009-12-15 19:50:17 -08:00
Rick Pasetto a183fb9f5e fix for gcc build 2009-12-15 19:48:02 -08:00
richard 943cae62db merge 2009-12-15 19:38:22 -08:00
Rick Pasetto e5c9fe005e Automated merge with http://demeter:8000 2009-12-15 19:36:03 -08:00
richard 3a02b9ec88 added setBlockFromValue so setting a LLRect param in code will set the individual left, right, top, bottom values, for example
don't call setupParams when creating widgets from code
moved Multiple param constraints into BaseBlock to remove extra scoping
2009-12-15 19:33:18 -08:00
Mark Palange (Mani) 491e93f898 Fixed misspelled debug qt names 2009-12-15 18:57:26 -08:00
Erica 17d1d3c129 EXT-2947 [BSI] Group Chat and Instant Message floaters missing minimze button, confusing functionality on X button 2009-12-15 18:47:46 -08:00
Rick Pasetto 66d9161729 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-15 18:00:09 -08:00
Monroe Linden c9a284fc69 Updated llqtwebkit 4.6 build, with link-target and cookie-saving patches applied. 2009-12-15 17:48:52 -08:00
callum b7747a815f Merge with tip before push 2009-12-15 17:53:03 -08:00