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
c577966d19
EXP-1631 FIXED (Selecting Edit for more than one Pick from Profile floater, breaks the navigation history in Picks Floater)
...
- Allowed to create a new instance of LLPanelPickEdit for each pick
2011-11-24 19:37:59 +02:00
b79ccf9dd7
EXP-1554 FIXED (Selecting More Info for more than one Classified section in Search floater, breaks the navigation history in Picks Floater)
...
- For each classified info create a new instance of LLPanelClassifiedInfo
- Added destructor for LLPanelProfile::ChildStack to avoid memory leak
2011-11-18 20:02:54 +02:00
55207c8499
EXP-1536 fix from paul PE
2011-11-10 11:46:39 -08:00
3ecba909a3
Merge from PE. Thanks Paul
2011-11-09 11:15:41 -08:00
58138aa37b
EXP-1537 FIXED (Selecting More Info from Classified section in Search floater launches People panel with inactive Edit button and access to OLD profile window)
...
- Opening Floater Picks instead of old profile panel
2011-11-09 14:28:41 +02:00
465fd7c25f
EXP-1539 FIXED (Viewer crash when clicking twice on slapp link secondlife:///app/classified/create)
...
- Simple NULL checking to avoid crash
2011-11-07 14:22:29 +02:00
334d8f4076
Updating 'createPick' behavior to mirror new 'createClassified' behavior
2011-11-02 11:42:41 -07:00
a900701f55
EXP-1474 FIX -- Create Classified does not work from Search Window
...
* The code now opens the "picks" window and starts the "create new classified"
action on it directly.
Reviewed by Richard.
2011-11-02 11:03:38 -07:00
c44db34a15
Merge
2011-09-28 17:14:50 +03:00
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
a80d5f2b46
EXP-1222 FIXED Added a floater for My Profile side tab.
...
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
- Removed obsolete code implementing the tri-state behavior of Profile side panel.
- Added People panel XUI which is referenced from Profile panel.
2011-09-26 15:21:46 +03:00
592294a6ac
SOCIAL-615 FIX Selecting create group, classified, or pick in profile and responding to notification with Don't Quit, clicking on the action again does not show notification
2011-03-01 20:11:49 -08:00
e062a2778b
SOCIAL-608 FIX Create Classified link is available in Basic mode
...
SOCIAL-609 FIX Create Pick link is available in Basic mode in the web profile
SOCIAL-610 FIX View group info in Viewer sidebar are available in Basic mode
2011-02-28 23:43:05 -08:00
e02b83c350
SOCIAL-608 WIP Classified link is available in Basic mode
2011-02-28 22:06:21 -08:00
8d2c4369da
Validation check for edit classified and edit pick slapps
2011-01-06 16:31:27 -05:00
3c00c1ba45
merge viewer-development into web-profiles
2010-12-07 15:05:57 -05:00
37c65e371d
STORM-690 ADDITIONAL FIX Hide "Loading..." text that can be seen under transparent Avatar Picks accordion.
2010-12-06 16:14:50 +02:00
8acc2ec9f6
STORM-690 FIXED Underlying panels were visible in undocked sidepanels.
...
By the way, fixed losing focus when switching between panels in Me and Places SP (which made the floater semi-transparent).
2010-12-06 15:01:36 +02:00
7b1dd1c84e
SOCIAL-84 FIX, SOCIAL-85 FIX - new slapps for edit classified, create and edit pick
2010-10-22 11:35:58 -04:00
53eeee7b70
support for edit classified slapp
2010-10-21 14:41:42 -04:00
dd1b70f712
SOCIAL-84, SOCIAL-85 WIP
2010-10-20 17:03:36 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
95b021b990
FIRE-548, fix disappearing icons when resizing picks panel
2011-06-11 11:12:43 -04:00
0080ed8e29
Merge
2011-03-31 14:07:54 -07:00
593639b176
Merged with default tip (Revision e5176946eb04)
...
--HG--
branch : .RLVa
2011-02-17 16:09:01 +01:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
02d8197019
changed buildPanel/buildFloater to member functions buildFromFile
...
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
c20bd2dfee
cleaned up LLUICtrlFactory...
...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
8421d3dcd3
PE merge
2010-04-01 17:01:08 +01:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
af77b77134
CID-450
...
Checker: FORWARD_NULL
Function: LLPanelPicks::onPanelClassifiedEdit()
File: /indra/newview/llpanelpicks.cpp
2010-03-23 14:02:41 +00:00
a375db6d75
CID-451
...
Checker: FORWARD_NULL
Function: LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit *)
File: /indra/newview/llpanelpicks.cpp
2010-03-23 13:58:41 +00:00
dc3c0c6016
Fixed normal bug EXT-6436 - Not showing all classifieds in Profile sidebar.
...
Updated code to be able to receive classifieds list in two or more packets.
2010-03-23 12:09:57 +02:00
d6b32cd0a8
Update for major bug EXT-5942 - Entering a Classified with a banned keyword doesn't publish, and doesn't let you edit.
...
Updated code for disabling verbs for unpublished classified.
--HG--
branch : product-engine
2010-03-10 11:24:22 +02:00
2197304984
Fixed major bug EXT-5942 - Entering a Classified with a banned keyword doesn't publish, and doesn't let you edit.
...
Changed the way panels handle classified publishing - each classified panel will keep listening to callbacks and will know when classified is published successfuly.
If publish failed, panel will allow user to edit classified and try publishing again.
All unpublished classifieds will be lost on Viewer restart.
--HG--
branch : product-engine
2010-03-10 10:21:19 +02:00
b513811c7b
Update for commit 10217 : 158e0438a11b (WIP on EXT-5687 (Classifieds are missing the clickthrough data)).
...
Updated parameter name.
--HG--
branch : product-engine
2010-03-09 15:20:42 +02:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
b60274fad4
WIP on EXT-5687 (Classifieds are missing the clickthrough data).
...
Updating classieifed click stats when user presses "Teleport" or "Map" button in the picks/classifieds list side panel.
--HG--
branch : product-engine
2010-03-05 19:30:31 +02:00
eeb6e89e60
WIP on EXT-5687 (Classifieds are missing the clickthrough data).
...
Updating click stats on:
* opening classified info
* clicking "Map" or "Teleport" buttons in classified info
* clicking "Details" in the web-based search floater
--HG--
branch : product-engine
2010-03-05 19:03:00 +02:00
Nicky