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

48 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
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
Richard Linden 3861249a74 use lazy deletion of views via die() method to avoid some potential crashes 2012-01-03 09:41:16 -08:00
Paul ProductEngine 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
Paul ProductEngine df7f4f60b6 EXP-1576 FIXED (Remove old profile window from People panel) 
- Removed old profile window from People panel with all subpanels and dependencies
 2011-11-18 19:32:58 +02:00
Paul ProductEngine 96a94a5840 EXP-1311 FIXED (Modified My Profile floater to become Picks floater: removed unused profile panel.) 
- Modified My Profile floater to become Picks floater: removed unused profile panel.
 2011-10-14 23:53:43 +02:00
Richard Nelson ec23ec68ea EXP-1310 FIX Profile button should open Web Profile floater 
removed unused LLWeb functions for opening non-web media
moved logic inside floaters and away from auxiliary functions
 2011-10-10 19:17:38 -07:00
leyla c762beed26 Merge 2011-03-14 11:28:13 -07:00
leyla bc2aca863f SOCIAL-687 Call, Map, Share, and Pay options available in web profile for users in minimal skin 2011-03-14 11:23:15 -07:00
Leyla Farazha 6158929e3e SOCIAL-586 As a user I want to see my Aditi profile when logging into the Aditi grid 2011-03-09 11:51:07 -08:00
callum 855fd156b0 SOCIAL-405 FIX Always make Web profiles open in internal Web content floater regardless of prefs 2010-12-29 13:35:23 -08:00
callum fa776d8054 Merge with tip of viewer-development 2010-12-22 15:22:43 -08:00
Vadim ProductEngine 10d9328b86 STORM-786 ADDITIONAL FIX Fixed Windows build. 2010-12-15 16:00:37 +02:00
Vadim ProductEngine 27f3470b7e STORM-786 FIXED Fixed disappearing controls in avatar picks list. 
Caused by an improper fix of STORM-690.

Made the way we switch between profile view panels (profile view / pick_info / pick_edit)
more robust. It now suits both My Profile and Profile View panels.
 2010-12-15 15:44:06 +02:00
Brad Payne (Vir Linden) 3c00c1ba45 merge viewer-development into web-profiles 2010-12-07 15:05:57 -05:00
Vadim ProductEngine 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
Brad Payne (Vir Linden) 7b1dd1c84e SOCIAL-84 FIX, SOCIAL-85 FIX - new slapps for edit classified, create and edit pick 2010-10-22 11:35:58 -04:00
Brad Payne (Vir Linden) 53eeee7b70 support for edit classified slapp 2010-10-21 14:41:42 -04:00
Brad Payne (Vir Linden) dd1b70f712 SOCIAL-84, SOCIAL-85 WIP 2010-10-20 17:03:36 -04:00
Arrehn 8d9fba43b9 Firestorm merge catchup 2011-08-27 06:00:46 -04:00
Arrehn df2d7a0c6d Base opensim compatibility, by Armwin W/Kokua, used by permission 2011-08-21 23:45:18 -04:00
Kelly Washington 0080ed8e29 Merge 2011-03-31 14:07:54 -07:00
Brad Payne (Vir Linden) 5ef8545f63 consolidate generating profile URL, force to lower case 2010-10-18 18:11:29 -04:00
Brad Payne (Vir Linden) 993136fe34 Initial hooks for web profiles support 2010-10-12 08:43:16 -04:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory... 
removed redundant functionality
moved buildPanel to LLPanel
 2010-08-16 15:00:51 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Vadim Savchuk 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
Dmitry Zaporozhan 879675d986 Fixed critical bug EXT-4823 - [NUX] Default My Profile to Edit Mode 
--HG--
branch : product-engine
 2010-02-04 12:55:52 +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
Yuri Chebotarev c6177836ec no ticket, minor refactoring. 
add return value to notifyXXX functions, may be usefull

--HG--
branch : product-engine
 2009-12-07 12:04:27 +02:00
Kent Quirk f496c2b164 DEV-43622 : API change (no functionality change) to fix a design error in LLSD 
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
 2009-12-01 20:59:08 -05:00
Vadim Savchuk 87d7c6d6f9 Work on task EXT-2092 (Task Panel tabs should toggle visibility of the panel). 
Made the People and Me task panels support the desired tri-state behavior.
Until all the other task panels support that behavior, it is disabled.

--HG--
branch : product-engine
 2009-11-24 21:18:09 +02:00
Dmitry Zaporozhan d04539f74a Update for major task EXT-2251 - Implement panels for creating, editing and viewing Classifieds. 
Fixed bugs, improved functionality.

--HG--
branch : product-engine
 2009-11-10 13:21:02 +02:00
Dmitry Zaporozhan 1b0732183e Merge 
--HG--
branch : product-engine
 2009-11-09 15:59:29 +02:00
Dmitry Zaporozhan 148a29ea1e Implemented major task EXT-2251 - Implement panels for creating, editing and viewing Classifieds. 
--HG--
branch : product-engine
 2009-11-09 15:54:54 +02:00
Lynx Linden 97f9ad9f4c DEV-41358 DEV-41361: Added support for new SLAPP URLs, needed for the 
new Search web pages. These are:

secondlife:///app/worldmap/{NAME}/{COORDS}
  Show the given coordinate on the World Map
secondlife:///app/agent/{UUID}/pay
  Pay the specified Resident
secondlife:///app/agent/{UUID}/im
  IM the specified Resident
secondlife:///app/agent/{UUID}/requestfriend
  Request friendship of the specificed Resident
secondlife:///app/agent/{UUID}/offerteleport
  Offer to Teleport the specified Resident
secondlife:///app/agent/{UUID}/mute
  Mute/Block Resident
secondlife:///app/agent/{UUID}/unmute
  Unmute/Unblock Resident
 2009-11-03 17:16:37 +00:00
Steven Bennetts fe9719e804 Merging revisions 2094-2099 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1612 EXT-1604 EXT-1163 EXT-1163 EXT-1167
* Dev: EXT-1516
 2009-10-21 03:39:04 +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
James Cook ec84b639ed EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard. 2009-10-07 20:54:31 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
 2009-10-03 23:40:28 +00:00
Steven Bennetts 606b381c9f merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
 2009-09-29 19:37:05 +00:00
Martin Reddy cb926640b7 DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 
following SLAPP URL types in an untrusted browser:

  secondlife:///app/agent/...
  secondlife:///app/group/...
  secondlife:///app/parcel/...

In order to find a compromise between supporting these commands and
security concerns over potential griefing vectors, we use a throttling
solution when these commands are issued by untrusted web browsers.
That is, we only process one command per 15 seconds.

This applies to external browsers, like Firefox, as well as the
internal SL browser.

Notably, we continue to block secondlife:///app/teleport URLs.

Reviewed by james.
 2009-09-14 17:09:45 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
 2009-08-27 19:00:18 +00:00
Steven Bennetts af98aad98d svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
 2009-08-26 20:47:27 +00:00
Steven Bennetts 3b65da1fad merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3 
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
 2009-08-14 22:40:13 +00:00
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
 2009-08-12 01:12:27 +00:00
Steven Bennetts db5cda2667 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
 2009-08-03 22:25:48 +00:00
Steven Bennetts f26f7e3e29 merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
 2009-07-08 05:19:19 +00:00