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

97 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih 27351b8bf5 automated merge for viewer-2.0 -> avp. 
--HG--
branch : avatar-pipeline
 2009-12-01 12:52:21 -05:00
Loren Shih f2da2c00a8 EXT-2859 : Landmark filters aren't explicitly fetching inventory recursively 
EXT-2815 : Create ability to selectively apply a filter

LandmarkSP filters are now started explicitly whenever the Library / My Inventory accordion panels are opened.

--HG--
branch : avatar-pipeline
 2009-11-30 10:54:48 -05:00
Paul Guslisty 857bc15a39 fixed normal bug EXT-2685. My Landmarks: "Sort by Date" becomes disabled after selecting it 
--HG--
branch : product-engine
 2009-11-27 19:08:02 +02:00
Eugene Mutavchi 7524fde032 Fixed low bug EXT-2794(MyLandmarks: "Create Pick" is enabled when multiple landmarks are selected) 
--HG--
branch : product-engine
 2009-11-27 17:59:59 +02:00
Sergei Litovchuk 3119468d06 Fixed normal bug EXT-2346 "My Landmarks accordion panels shouldn't be displayed if there are no landmarks in respective folders". 
- Added inventory observer to Landmarks Panel to update accordion tabs visibility upon inventory changes.
- Added accordions contents refreshing upon filter edit to fix updating accordion items when filter becomes less restrictive.

--HG--
branch : product-engine
 2009-11-23 21:47:59 +02:00
Sergei Litovchuk f3c53a84d3 Fixed normal bug EXT-2348 "My Landmarks: Show On Map does nothing for landmarks from Library" 
- Added callback to ensure that a landmark is loaded from the global landmark list.
- Added disabling "Map" button to indicate that a landmark info is being  loaded.

--HG--
branch : product-engine
 2009-11-19 22:38:27 +02:00
Loren Shih b88778ca7d Header file cleanup. 
Spelling cleanup.

Changed "Inventroy"->"Inventory".
Removed a couple of headers from llinventory.h.

--HG--
branch : avatar-pipeline
 2009-11-16 18:40:59 -05:00
brad kittenbrink 1ea60591a9 Refactoring of llviewerprecompiledheaders.h to hopefully increase stability 
and reduce unnecessary dependencies and incredibuild wedging.  Hopefully in
the long run this will reduce build time.  Also cleaned up a lot of header
file usage to conform better to the coding standard.

reviewed by james and steve.
 2009-11-13 20:33:59 -05:00
Steve Bennetts 8631443847 merge changes from product-engine 2009-11-06 18:13:38 -08:00
Loren Shih 9c048d12fd merge 
--HG--
branch : avatar-pipeline
 2009-11-06 18:31:52 -05:00
Loren Shih 2aa981ac23 EXT-2278 : "Save Texture As" for bottom panel 
EXT-2310 : "Save Texture As" for inventory right-click menu

"Save Texture As" now works properly and brings up the texture preview while saving.
Also added "Save Texture As" to the right-click inventory context menu.

--HG--
branch : avatar-pipeline
 2009-11-06 17:35:05 -05:00
Denis Serdjuk 01c83aa21e partial fix for minor bug EXT-1607 Trash and Gear buttons are enabled when nothing is selected. Now gear button will disabled when nothing is selected. 
--HG--
branch : product-engine
 2009-11-06 18:39:00 +02:00
Denis Serdjuk e4fdc0ba55 no ticket. major crash in Panel Landmark has been fixed. It was founded while investigating EXT-1607. 
--HG--
branch : product-engine
 2009-11-06 15:41:05 +02:00
Vadim Savchuk 759e76b1a3 merge 
--HG--
branch : product-engine
 2009-11-05 16:21:03 +02:00
Denis Serdjuk 8cec9098cd implemented minor task EXT-1617 No need to expand all accordion panels in the My Landmarks. 
Rollback previous incorrect  behavior   in changeset 45ece11eb7d8.

--HG--
branch : product-engine
 2009-11-05 15:54:05 +02:00
Steve Bennetts af401ac6dc Merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-11-04 19:15:12 -08:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Sergei Litovchuk 380bb0ce09 No ticket. Removed extra includes. Fixed copyright years. 
--HG--
branch : product-engine
 2009-11-04 15:24:11 +02:00
Eric M. Tulla (BigPapi) e87975284e update from viewer2 and merge into avp 
--HG--
branch : avatar-pipeline
 2009-11-03 14:52:05 -05:00
Denis Serdjuk 80ec865c2b fixed minor bug EXT-1618 Add Landmark does nothing if resident stands exactly in the location of existing landmark 
--HG--
branch : product-engine
 2009-11-03 21:34:14 +02:00
Denis Serdjuk ebfe3d93d9 implemented minor task EXT-1617 No need to expand all accordion panels in the My Landmarks 
--HG--
branch : product-engine
 2009-11-03 20:04:57 +02:00
Loren Shih 310a7b60f7 Merge conflict resolution for previous commit. 
--HG--
branch : avatar-pipeline
 2009-11-02 16:22:18 -05:00
Loren Shih bde7d67066 EXT-1866 : Inventory Side Panel 
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel

Porting over changes from svn Inventory Panel work.
 2009-11-02 15:39:55 -05:00
Mike Antipov 2b259964d5 Fixed normal bug EXT-2001 ( [BSI] Can select multiple Landmarks in Places side panel and still click "Map" or "Teleport") 
- disable "Map" & "Teleport" buttons for selected folders

--HG--
branch : product-engine
 2009-11-02 16:18:11 +02:00
Mike Antipov 50047b1ea5 Fixed normal bug EXT-2001 ( [BSI] Can select multiple Landmarks in Places side panel and still click "Map" or "Teleport") 
- process enable state for "Teleport" & Show on Map" buttons in the same way as appropriate gear&context menu items

--HG--
branch : product-engine
 2009-11-02 12:12:26 +02:00
Mike Antipov 5d757d2b5f Implemented normal task EXT-2014 (Places - Landmarks: Collapsed accordion panels should expand while filtering if they contain matched items) 
--HG--
branch : product-engine
 2009-10-30 14:23:32 +02:00
Mike Antipov c70214f941 Fixed normal bug EXT-1619 (Accodion panel should be hidden if it has no content matches filter) 
- added processing a count of visibled items in accordion tabs.

--HG--
branch : product-engine
 2009-10-28 18:00:00 +02:00
Denis Serdjuk 3b40f9052b fixed Bug EXT-1602 'Add new folder' and 'Add new landmark' has same icons that is deceitful 
New menubutton has been implemented according to
Viewer 2.0 Design Specification:Places Task Panel.
It generates a menu for AddLandmark and AddFolder options

--HG--
branch : product-engine
 2009-10-27 13:49:06 +02:00
Steve Bennetts 80b682d4b4 merge 2009-10-23 12:17:30 -07:00
Steven Bennetts b43771cad5 Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry 
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
 2009-10-23 17:20:45 +00:00
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07:00
Steven Bennetts c7786aa5b6 Merging revisions 2146-2150 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry 
* Bugs: EXT-1752 EXT-1754
 2009-10-22 00:25:11 +00:00
Steven Bennetts 0041d485b1 Merging revisions 2129-2144 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry 
* Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720
* Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
 2009-10-22 00:21:18 +00:00
Steven Bennetts 6f41747bc4 Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
 2009-10-21 04:58:23 +00:00
Steven Bennetts 2c1aacf814 Merging revisions 2102-2104 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1609 EXT-1255 EXT-1299
 2009-10-21 04:47:55 +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
Steve Bennetts 909e784deb Fix from last merge. 2009-10-19 12:16:19 -07: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 8103710c05 Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253  EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
 2009-10-19 01:45:44 +00:00
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
 2009-08-28 22:58:17 +00:00
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +00:00
James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
 2009-07-27 17:56:26 +00:00
Steven Bennetts 73a97010e6 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-07-21 00:57:23 +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
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
 2009-07-07 00:53:05 +00:00
Steven Bennetts 39905b927d merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 2009-07-02 00:38:13 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00