Commit Graph

79 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Nicky 1714747536 After merge compare FS tree agsindt V/dev.
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine 8fd2d69fdf EXP-1224 FIXED (Create and register a floater for People side tab)
- Added a floater for People side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
2011-09-27 22:51:43 +03:00
Liny 2923d413ef EoL change, no code change 2011-09-01 18:08:44 -07:00
Tozh 730739f18b Group info floaters. 2011-06-29 03:02:51 -04:00
Kadah b5a87651b7 Added support for LLPanelGroup to parse "open_tab_name"
Added support for LLGroupActions::show to specify tab to open to
Does not work on skins that use accordion tabs
2011-06-17 18:42:31 -07:00
Seth ProductEngine 0a938d395c STORM-266 FIXED displaying group notices in detached People SP.
Fixed failure getting pointers to some child panels of LLSideTray while parent side panels are detached.
2010-09-28 19:40:31 +03:00
Vadim Savchuk 6b77ce904e STORM-92 FIXED Avoid redundant visibility changes when attaching/detaching side tray tabs.
Also happens to fix STORM-96 (Empty space appears in the top of Home side panel after redocking).
2010-09-09 21:05:13 +03:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Paul Guslisty 4a53696d72 EXT-8179 FIXED (Group profile: 'Save' button remains disabled if state of check-boxes was changed during refreshing of 'General' accordion)
Disable accordion while refreshing group properties so the user could not change properties during refresh

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/815/

--HG--
branch : product-engine
2010-07-29 13:37:29 +03:00
Tofu Linden 44d0fd81ee (hairy) merge from viewer-release 2010-07-26 10:34:39 +01:00
Mike Antipov d6726e6e4b EXT-8299 FIXED Added rearranging of the group accordion to fit all space if only General tab is visible.
Also fixed name of accordion in code to be consistent with xml.
Replaced findChild with getChild (when getting accordion and its tabs) to avoid extra checks against NULL of returned pointers
 and have warnings in log is xml is not consistent with code.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/798/

--HG--
branch : product-engine
2010-07-23 17:42:06 +03:00
Andrew Polunin a96f47db68 EXT-8164 FIXED (Accordions should be reset to default state after Edit Outfit panel reopening)
Now accordion on panels 'Edit Outfit', 'Editing Shape', 'Editing Hair', 'Editing Eyes', 'Editing Skin', 'Group Profile' and 'Place Profile' are reset when the panels are closed and then opened again.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/782/

--HG--
branch : product-engine
2010-07-21 19:00:57 +03:00
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07:00
Yuri Chebotarev 78b3419fc8 EXT-7143 FIXED remove redundat code
reviewed V.Savchuk at https://codereview.productengine.com/secondlife/r/358/

--HG--
branch : product-engine
2010-05-07 08:51:23 +03:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Eugene Mutavchi ac141e1862 Related to normal bug EXT-6345 (SLapp group profile does not display group name.) - fixed group info panel title to show "Loading..." while waiting for group info.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/124/

--HG--
branch : product-engine
2010-03-26 20:45:04 +02:00
Ychebotarev ProductEngine 83779c45a1 fix for normal EXT-5326 Cannot access full group options in God mode
--HG--
branch : product-engine
2010-02-22 14:46:53 +02:00
Andrew Dyukov cb95fc1f48 No ticket. Replaced calls of LLVoiceClient::getInstance() to LLVoiceClient::instanceExists() in checks before
removal of voice client status observers. These checks were introduced in changeset bc6a6ab2ce54.

--HG--
branch : product-engine
2010-02-19 22:17:31 +02:00
Ychebotarev ProductEngine d3f30dc96e fix task EXT-5129 Move Group image and founder name into General accordion
--HG--
branch : product-engine
2010-02-10 11:13:26 +02:00
Vadim Savchuk 14caf5475b Merge from default branch
--HG--
branch : product-engine
2010-01-28 13:58:00 +02:00
Ychebotarev ProductEngine 3c616d627b fix for EXT-4742 Group Info panel state resets on save
--HG--
branch : product-engine
2010-01-28 09:16:13 +02:00
Tofu Linden b6684dce80 CID-196
Checker: RESOURCE_LEAK
Function: process_improved_im(LLMessageSystem *, void **)
File: /indra/newview/llviewermessage.cpp

partial fix.  either coverity doesn't grok that the remaining case gets freed way down the line by the callbacks, or.. it really doesnt.
2010-01-27 14:54:06 -08:00
Andrew Dyukov ab0c9c6754 Fixed normal bugs EXT-4450 ([BSI] call buttons enabled when voice is disabled) and EXT-4313
(Should not be able to start a call when voice is disabled). Call buttons state now reacts on
voice changes in time.

- Added voiceWorking() method to LLVoiceClient to determine real availability of voice, because voiceEnabled()
doesn't take into account possible errors. Perhaps there is no need in two methods- some investigation will be
made and depending on its results they may become one non-static method. voiceWorking() uses state of voice
client(mState) to determine voice availability. Also some states which are not currently counted by voiceWorking()
as valid may be added if testing reveals problems.

- To enable/disable call buttons in time, LLVoiceClientStatusObserver is used. Its trigger uses states from its
enum only to skip updating button in some states(to avoid button blinking), but to determine button state
LLVoiceClient's voiceWorking() is used.

--HG--
branch : product-engine
2010-01-22 22:16:57 +02:00
Ychebotarev ProductEngine 682fd146b0 fix for normal EXT-4554 [BSI] group join now button goes missing after failure to join due to maximum groups
--HG--
branch : product-engine
2010-01-22 15:25:46 +02:00
Ychebotarev ProductEngine ab689479ba fix normal EXT-4494 [BSI] Group Chat and Group Call buttons are shown even when you are not in the group
--HG--
branch : product-engine
2010-01-21 10:13:44 +02:00
Ychebotarev ProductEngine 56855769ce fix for normal EXT-4377 Disable appearance of Roles, Notices and Land/Assets accordeons for non avatar's groups
--HG--
branch : product-engine
2010-01-18 14:32:35 +02:00
Paul Guslisty 891f2b3a75 Fixed normal bug EXT - 4047 (No verb/action buttons at bottom of Group profile panel)
--HG--
branch : product-engine
2010-01-13 14:55:42 +02:00
Ychebotarev ProductEngine 4a902dd76a fix normal EXT-3987 [BSI] *Save* button in group profile should be greyed out when there are no changes to save
"save" btn will not be visible for groups where you are not a member. fixed enabled/disabled state

--HG--
branch : product-engine
2010-01-11 15:07:44 +02:00
Yuri Chebotarev b982437900 fix for EXT-3899 [BSI] Cached group infos are shown when you're not a member of the group
make it the same way it was in 1.23x - if you are not a member only general tab will be accesable.

--HG--
branch : product-engine
2010-01-05 16:15:22 +02:00
Loren Shih 1ca104f325 dos2unix fix for llpanelgroup.cpp. 2009-12-10 14:05:24 -05:00
Yuri Chebotarev d36b993e92 fix low EXT-1112 No critical notification if quiting SL with unsaved group
--HG--
branch : product-engine
2009-12-08 12:53:45 +02:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Roxie Linden 0ac14158bc automated merge from trunk 2010-02-25 14:12:18 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
Andrew Dyukov 888bc27cf6 Fixed normal bug EXT-1526. We decided to show full name via tooltip, because if name is long without truncating it
we'd have to manually move widgets that are below it(which is hard to do).

--HG--
branch : product-engine
2009-11-05 19:44:18 +02:00
Lynx Linden 077025fa1e DEV-39999: Removed all legacy help buttons and notifications from the
code. All help should now go through the new help server, via the Help
Browser floater. There should no longer be any custom "?" buttons in
the UI - all <button> and <notification> XUI references relating to
custom help buttons have been expunged.

(I previously extracted all of the help strings from notifications.xml
and passed these to the doc team to include in the help server pages.)

I have checked that none of the XUI elements that are removed here are
still referenced by any C++ code. I've also confirmed that there are
no new notifications removed that I have not already passed on to the
doc team. And I've also done a pass through the UI to make sure that
all of the floaters still look as they should. Finally, I've confirmed
that the new help system for floaters and side panels still works.

2,276 lines deleted - 0 lines added.
2009-11-03 10:28:57 +00:00
Steven Bennetts ea1bfae838 Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154
2009-10-19 02:17:01 +00:00
Steven Bennetts 4ee757b45d Merging revisions 2036-2042 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bug Fixes: EXT-1542 EXT-1540 EXT-1529 EXT-1539
2009-10-18 22:42:55 +00:00
James Cook a4c657a49d Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla. 2009-10-16 23:20:05 +00:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
Steven Bennetts 20e56a6925 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
2009-10-13 16:25:48 +00:00