Commit Graph

212 Commits (bfe520387ed3061ba55ea2e58c565016e7a3159e)

Author SHA1 Message Date
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Brad Payne (Vir Linden) b16dcda6a3 SH-3860 WIP, SH-3899 WIP - make folder version management more debuggable, log appearance request results 2013-02-25 19:12:36 -05:00
Brad Payne (Vir Linden) 0777f53e2f SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents 2012-12-10 14:47:17 -05:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Richard Linden 4775084000 CHUI-101 WIP Make LLFolderview general purpose
inventory item labels and icons displaying again
2012-06-21 23:28:24 -07:00
Richard Linden 3882e9c177 CHUI-101 WIP Make LLFolderview general purpose
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
2012-06-20 00:19:05 -07:00
Richard Linden 9940ca5ae7 CHUI-101 WIP Make LLFolderView general purpose
llfolderview refactornig
2012-06-15 09:44:27 -07:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Brad Payne (Vir Linden) 681c5de92b SH-3128 FIX - log message cleanup for avatar rezzing 2012-05-02 16:48:09 -04:00
Richard Linden 4523b31378 EXP-1844 FIX Selecting a large number of inventory items can block the viewer for a long time.
only show hourglass and fetching text when downloading folders, not item metadata
2012-02-09 12:58:43 -08:00
Vadim ProductEngine c437c3b5b5 EXP-1815 FIXED Favorites list in login screen not populated when display names are disabled.
* Fixed LLAvatarName::getLegacyName() to work when display names are disabled
  (it used to return ' ', i.e. empty first and last name separated with a space).
* Added some debugging messages.
2012-01-19 20:34:31 +02:00
Leslie Linden 94678c2f7f EXP-1541 update -- Route inventory items sent in a Notecard to correct locations rather than auto-sorting by asset type
* New code specifies explicit destination for "copy from notecard" or null, indicating the sim should determine the placement.

Reviewed by Stone.
2011-11-04 11:26:50 -07:00
Leslie Linden 0ff49e798c EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
* Removed old inventory panel.
* Renamed new inventory panel from "my_inventory" to "inventory"

Reviewed by Richard.
2011-10-17 15:18:19 -07:00
Richard Nelson e61da05739 merge with viewer-development 2011-10-05 13:01:29 -07: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 87db6c59ee Merge 2011-09-27 22:32:26 +03:00
Paul ProductEngine 3c8b0ab537 EXP-1226 FIXED (Create and register a floater for Appearance side tab)
- Added xml for a new floater Appearance and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::getPanel
2011-09-27 22:06:56 +03:00
Seth ProductEngine 0f3221e25d EXP-1225 FIXED Added a floater for My Inventory side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
- Added LLFloaterSidePanelContainer::getPanel<T>() for getting custom type panels.
2011-09-27 21:05:05 +03:00
Vadim ProductEngine 0db01825c5 STORM-1614 FIXED Untranslatable gesture: /bow
Backed out changeset ed2791ae1cf0.
2011-09-21 00:34:35 +03:00
Vadim ProductEngine 729a8d1a76 STORM-1554 FIXED Fixed typo in a gesture name. 2011-08-12 16:39:15 +03:00
Vadim ProductEngine f8a17690bc STORM-1291 FOLLOWUP Localized common (unisex) gestures. 2011-08-02 18:37:14 +03:00
Vadim ProductEngine a1b99c4821 STORM-1291 FIXED Localize names of inventory items fetched via HTTP post requests.
These were not localized, unlike ones fetched via the message system.
2011-07-26 18:28:06 +03:00
Leyla Farazha ee1ba4d85c adding inbox/outbox creation options 2011-05-31 15:11:55 -07:00
Oz Linden 0656620e2d merge changes for storm-1187 2011-04-22 11:49:41 -04:00
Leyla Farazha 2411a107e7 EXP-628 Inventory floater may be opened by SLApp
EXP-630 My appearance floater may be opened by SLApp
EXP-633 Search floater can be opened by SLApps
2011-04-18 14:22:23 -07:00
Seth ProductEngine 73cfc64bee STORM-1145 ADDITIONAL FIX Fixed removing the record of user favorites available at login location menu when user switches off this feature.
User favorite locations record is removed from the settings file each time when user exits the viewer with "ShowFavoritesOnLogin" setting off and his name is found on the record.
2011-04-12 02:09:37 +03:00
Oz Linden 99d4f57351 merge out from viewer-development 2011-01-21 16:37:39 -05:00
Oz Linden b01ca1293b merge up to latest viewer-development 2011-01-13 11:14:13 -05:00
Aaron Stone 40cd537054 Switch inventory capabilities to FetchInventory2 and family. 2011-01-07 18:30:03 +00:00
Oz Linden e1e38c4cee merge changes for storm-34 2011-01-07 10:39:05 -05:00
Andrew Productengine c02d6a319f STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference instead of per-machine.
- Made changes in code of floater preferences and panel login that were required because of turning the setting per-account.

- Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
2010-12-23 18:15:54 +02:00
Andrew Productengine 32750132db STORM-34 ADDITIONAL_FIX Implemented storing of multi-user favorites and showing them on login screen.
- Changed the way SLURLs are cached a little, because previous one introduced problems with theit order.

- Also allowed saving of favorites to disk even if not all of them received SLURL info - this is done to avoid favorites not saving when there is at least one "dead" landmark among them.

- "Username" field on login screen is now not a lineeditor, but combobox (to enable autocompletion), but without button (Esbee asked for this in ticket for security reasons, and perhaps for visual consistency).

- Elements of this combobox are names of users whose favorites we have saved in file.

- Contents of "Start at:" combobox are changed depending on changes in "Username"- if username is present in favorites file, favorites for this user are added there.

- New callback was added to LLCombobox and used in this fix, because present ones weren't enough to easily track changes in text entry.
2010-12-09 19:54:40 +02:00
Brad Payne (Vir Linden) 3c00c1ba45 merge viewer-development into web-profiles 2010-12-07 15:05:57 -05:00
Andrew Productengine d6f8efae24 STORM-34 FIXED Saving of user's favorites into file and showing them in "Start at" combobox on login screen was implemented.
Implementation details:

- File is saved on exit from viewer and not immediately on changes as was written in spec. It is done to make this file consistent with favorites order: order of favorites is saved on exit,
so if favorites info is saved in other moment earlier, crashing viewer or other unexpected way of finishing its work (i.e. via Windows task bar) would cause inconsistence between favorites order
saved per account and one from this new file.

- File is saved in user_settings\stored_favorites.xml.

- If you uncheck the option in Preferences and press OK, the file gets immediately deleted (according to spec).


Issues that require further changes:

- Currently only favorites of last logged in user are shown in login screen. Showing favorites of multiple users will be implemented later when design for it is approved by Esbee.

- Preference is now global for all users, because design states it may be changed before login, and we don't have account info at the moment. But it doesn't seem to be a good idea, so changes in design are needed.

- Currently the way of retrieving SLURLs needs optimization in a separate ticket.

More detailed design approved by Esbee is needed to develop it further, perhaps in new tickets.
2010-12-06 18:05:44 +02:00
Oz Linden efa42a6aab merge up to viewer-development 2010-12-04 09:14:58 -05:00
prep linden 03fd5c02f7 Added support for map tracking slapp, share slapp and a voice call slapp.
slapp urls:
 secondlife:///app/maptrackavatar/lluid
 secondlife:///app/sharewithavatar/lluid
 secondlife:///app/voicecallavatar/lluid
2010-10-21 15:57:06 -04:00
prep linden e12ec78127 secondlife:///app/maptrackavatar/lluid
secondlife:///app/sharewithavatar/lluid
secondlife:///app/socialcallhandler/lluid <-work in progress
2010-10-21 13:26:13 -04:00
Aimee Linden 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
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01: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
Loren Shih 981a43b355 Created new wearable type.
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00