livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,776 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Mike Antipov 11ef9f3d41 Work on normal task EXT-2640 (Create a tabbed IM multifloater) 
- disabled Transient & Dockable functionality of IM Floaters to do not have collisions with multifloater
- remove debug attributes in xml

--HG--
branch : product-engine
 2009-11-23 16:29:10 +02:00
Dmitry Zaporozhan 25085a67f4 Merge 
--HG--
branch : product-engine
 2009-11-23 15:53:19 +02:00
Dmitry Zaporozhan 9f0dbcf4c0 Update for task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets. 
Cleaned code, added comments.

--HG--
branch : product-engine
 2009-11-23 15:50:49 +02:00
Andrew Dyukov d2cee29e8a Fixed normal bug ETX-2651 (Locations from teleport history are added to location history). 
--HG--
branch : product-engine
 2009-11-23 14:44:07 +02:00
Tofu Linden 03023e47a8 intentionally break build to see what parabuild says. 2009-11-23 11:39:59 +00:00
angela dd9b1f819d EXT-2297 Functionality Loss - Ability to copy (control+c) residents name from their profile & local chat 2009-11-23 17:33:03 +08:00
angela e367e2efc2 EXT-2159 Create Vertical Slider to use for zoom in / out controls in view 2009-11-23 13:52:40 +08:00
Monroe Linden 1b07c1d7fb Fix for DEV-43040 (Change media focus rules to be the same as alt-zoom). 
Added an optional reset_camera parameter to LLPanelPrimMediaControls ::resetZoomLevel(). Default is true, but if false it prevents the reset from moving the camera, and just resets the internal state for zoom tracking.

Fixed zoom-related bugs in LLPanelPrimMediaControls::close() and LLPanelPrimMediaControls::onClickZoom().

Changed the zooming behavior in LLViewerMediaFocus to match the desired behavior.
 2009-11-20 17:49:52 -08:00
Monroe Linden 8f451be20e Change to fix DEV-43230 (Japanese input methods don't work with the web browser plugin on the Mac.) 
Inside LLWindowMacOSX::allowLanguageTextInput(), tell the Text Services Manager to put up its own UI for input methods if language text input is being disallowed.  This means that the non-inline UI will come up when when entering text in a browser plugin instance with an interactive text input method selected.
 2009-11-20 17:12:46 -08:00
Steve Bennetts 8ea25d130d Merge 2009-11-20 17:39:28 -08:00
Steve Bennetts 017b989de4 Merge 
--HG--
branch : product-engine
 2009-11-20 17:38:42 -08:00
Steve Bennetts 92d725a10e Merge 2009-11-20 17:23:42 -08:00
Steve Bennetts 90b72b1c71 merge 2009-11-20 17:19:27 -08:00
Ramzi Linden 3ea3f52aed merge 2009-11-20 17:18:46 -08:00
Ramzi Linden 1d5775a23f - Changed the EN links used for the KnowledgeBase to its new home on the sl wiki. 
- DEV-43134 Insert localized hyperlinks for all places in XUI where viewer jumps to the web.
(This will be needed for Phase 4 Testing of QAR-1355)
 2009-11-20 17:16:26 -08:00
Eric M. Tulla (BigPapi) 8580f840f3 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-20 19:28:48 -05:00
Eric M. Tulla (BigPapi) a3930c7ff7 Inventory Offer changes and clickable inventory slurls 2009-11-20 19:27:33 -05:00
Rick Pasetto 1d9d099baa Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-20 16:26:55 -08:00
Rick Pasetto daef055db9 Add log warning if media cap is missing 2009-11-20 16:26:43 -08:00
Monroe Linden 20bcd7efeb Hopefully, really fix DEV-42093. 2009-11-20 15:07:48 -08:00
Nyx (Neal Orman) 52c27b99b8 EXT-829 share button in people panel is inactive 
First pass at getting share buttons in the three places we need them:
person's profile
IM window
people panel

Only UI changes so far, functionality in a future checkin.

Will be reviewed before pushing.

--HG--
branch : avatar-pipeline
 2009-11-20 17:52:17 -05:00
James Cook cbbb107d1f merge 2009-11-20 14:45:51 -08:00
Steve Bennetts 0bdf520f4f Merge from product-engine 2009-11-20 14:43:58 -08:00
James Cook 67c832d94b EXT-1743 People inspectors should show Age, not Date born 2009-11-20 14:39:46 -08:00
Rick Pasetto 3bb86f91bc Clean up some logging 2009-11-20 14:01:49 -08:00
James Cook ad02019d71 Use "Select/Close" as button labels for avatar picker if choosing people repeatedly. 
Used by group member invitations, for example, where the "OK/Cancel" labels don't
make much sense.  Reviewed with Richard.
 2009-11-20 13:27:17 -08:00
Rick Pasetto 95ca60cafe Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-20 13:12:50 -08:00
Rick Pasetto 766af6102e DEV-41991 DEV-42756 : un-do the "fix" for the race condition regarding media data overwriting. 
I think the problem is that this floater's state is not updated
properly when the server response comes in.  This needs more thought.
 2009-11-20 13:11:39 -08:00
Rick Pasetto 1c57d96aa7 Delete the media impl instead of just unloading it. From Review #41 feedback. 2009-11-20 13:09:39 -08:00
Tofu Linden 32adc8473a merge D: 2009-11-20 20:58:02 +00:00
Vadim Savchuk 70a0dbe8f8 Renamed classes and files for "Me" task panel for better readability. 
Renamed files:
- indra/newview/llpanelmeprofile.{cpp,h} to llpanelme.{cpp,h}
- panel_me_profile.xml to panel_me.xml
- panel_profile_user.xml to panel_my_profile.xml

Renamed classes:
- LLPanelAvatarMeProfile to LLPanelMyProfile
- LLPanelMeProfile to LLPanelMe
- LLPanelMeProfileEdit to LLPanelMyProfileEdit

--HG--
branch : product-engine
 2009-11-20 22:57:59 +02:00
Tofu Linden fa43b6ca0b merging heads again >:( 2009-11-20 20:39:50 +00:00
Loren Shih 7e181025c0 EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive 
Context menu now fills in after folder contents are fetched.

--HG--
branch : avatar-pipeline
 2009-11-20 15:38:50 -05:00
brad kittenbrink dd3c7a1a25 Fix for errors with integration tests failing to find libcrypto.so.0.9.7 2009-11-20 15:35:19 -05:00
Nyx (Neal Orman) ac78a7e8b8 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/ 
--HG--
branch : avatar-pipeline
 2009-11-20 15:32:01 -05:00
Nyx (Neal Orman) f440bc5bcf EXT-2596 EXT-2354 extra lines in put on > attach put on > wear submenus 
finishing the cleanup here, missed a couple of extraneous separators.

Will be post-reviewed.

--HG--
branch : avatar-pipeline
 2009-11-20 15:31:47 -05:00
Mark Palange (Mani) 555c1203ef Merge 2009-11-20 12:30:17 -08:00
James Cook f4913d55b0 Fix broken group "Invite" button from Erica's changes yesterday. 2009-11-20 12:24:37 -08:00
Tofu Linden 9f00a7f381 Merging heads, hmm. 2009-11-20 20:03:51 +00:00
Tofu Linden 2bf0c1af3b merge the heads. =.= 2009-11-20 20:02:42 +00:00
Mark Palange (Mani) 280a321867 Merge 
--HG--
branch : product-engine
 2009-11-20 11:40:11 -08:00
skolb f80b5ea361 DEV-42556 Viewer Preference for Parcel media cannot be enabled/disabled 2009-11-20 11:36:18 -08:00
Mark Palange (Mani) 172cba3c42 Added two more procedurally created dirs to .hgignore to reduce the clutter of an hg status 2009-11-20 11:21:24 -08:00
James Cook 75138ddfb2 Fix main loop to llerrs on memory alloc failure, was masked by misuse of LLFLoaterReg with LLFloaterMemLeak. 
Reviewed with Bao
 2009-11-20 10:46:58 -08:00
Eugene Mutavchi c9101f603a Implemented low task EXT-1153(FlatListView should support keyboard) 
--HG--
branch : product-engine
 2009-11-20 20:27:53 +02:00
James Cook c4298c4f37 Remove unused date code after review with Leyla. Will unbreak Mac build. 2009-11-20 10:25:02 -08:00
Mark Palange (Mani) 6016ac6588 EXT-2618 Added code to determine if the viewer is running 'compatibility mode' 
OS version string reports compatibility mode and real os version number, if accessible.
reviewed by Richard
 2009-11-20 10:09:22 -08:00
James Cook fc04d5bbb8 merge 2009-11-20 09:46:23 -08:00
Rick Pasetto 8bde51b92f Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-20 09:44:58 -08:00
James Cook 644ee3f5de merge 2009-11-20 09:41:14 -08:00