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

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Nat Goodspeed fc849873ab Remove dangling LLEVENTS_LISTENER_ARITY control 2009-11-10 13:16:33 -05:00
Yuri Chebotarev ebbca6470a merge 
--HG--
branch : product-engine
 2009-11-10 20:13:17 +02:00
brad kittenbrink 2fe083d36a Minor develop.py tweaks to make mac logs more readable in parabuild output. 
Supressing all the setenv spam.
 2009-11-10 12:58:22 -05:00
Rick Pasetto 42dc307954 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 09:41:19 -08:00
Alexei Arabadji c673ef4a91 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 
--HG--
branch : product-engine
 2009-11-10 18:47:00 +02:00
Alexei Arabadji 3a8c80a388 fixed EXT-2275 "[BSI] New incoming IM or Group IM pushes all existing (and 
new) chiclets off the right end of the chiclet bar."

--HG--
branch : product-engine
 2009-11-10 18:45:51 +02:00
Mike Antipov eb05116e2b Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
- update min width for chiclet panel
  - move showing of hidden buttons to place where resize strategy is determined

--HG--
branch : product-engine
 2009-11-10 18:07:19 +02:00
Dmitry Zaporozhan ebfb32f35b Merge 
--HG--
branch : product-engine
 2009-11-10 17:03:48 +02:00
Dmitry Zaporozhan 15372bbc34 Update for major task EXT-2250 - Implement Classifieds list in Picks panel. 
Removed temporary workaround which was expanding only one accordion in Picks panel.

--HG--
branch : product-engine
 2009-11-10 17:02:25 +02:00
Dmitry Zaporozhan 107525aa5a Update for major task EXT-2251 - Implement panels for creating, editing and viewing Classifieds. 
Fixed bugs, cleared code.

--HG--
branch : product-engine
 2009-11-10 17:00:29 +02:00
angela 26d481f385 (EXT-2343) Preference > Chat > ColorSwatch 's LLUIColorTable is not working 2009-11-10 22:49:25 +08:00
angela 63195e76ca check for NULL to prevent crashing 2009-11-10 22:46:58 +08:00
Mike Antipov 729df1aa33 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Initial refactoring of functionality:
  - cleaning
  - Imroved logic while resizing of bottom tray

--HG--
branch : product-engine
 2009-11-10 16:13:20 +02:00
Vadim Savchuk 5377f8628e merge 
--HG--
branch : product-engine
 2009-11-10 16:06:24 +02:00
Vadim Savchuk c3d9aa60a7 Merge from default branch 
--HG--
branch : product-engine
 2009-11-10 16:05:53 +02:00
Eugene Kondrashev e292f310fb No ticket. Cleaned up the code after last commit 
--HG--
branch : product-engine
 2009-11-10 15:35:58 +02:00
Eugene Kondrashev 60a7a1d891 Implemented Sub-task EXT-2214-Refactor IM Control Panels 
--HG--
branch : product-engine
 2009-11-10 15:25:39 +02:00
Mike Antipov 3eafbeaac5 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Initial refactoring of functionality:
  - Re-Fixed bug with visibility of chiclet panel of the min size
  - updated bottomtray xml to make buttons identical to each other
  - Imroved logic while resizing of bottom tray (changing width of chiclet & nearby panels, hide/show buttons)

--HG--
branch : product-engine
 2009-11-10 15:02:42 +02:00
Tofu Linden 93adff4569 merge. 2009-11-10 11:34:03 +00:00
Mike Antipov 7dabb3c46e No Ticket: added possibility to resize a floater in UI Preview Tool (if can_resize attribute is set in xml) 
--HG--
branch : product-engine
 2009-11-10 13:33:16 +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
Yuri Chebotarev f15767bbef merge 
--HG--
branch : product-engine
 2009-11-10 12:43:17 +02:00
Andrew Dyukov e808f41baf Fixed line endings from 4df44e70aa9d 
--HG--
branch : product-engine
 2009-11-10 11:37:10 +02:00
Ramzi Linden 54b39c3786 L10N: Add some translations to FR, DE, JA from Localization Cycle1. 2009-11-10 17:36:28 +08:00
Mike Antipov 555ad13426 merge 
--HG--
branch : product-engine
 2009-11-10 11:06:32 +02:00
Andrew Polunin 9dacb6b79e fixed normal bug EXT-1649 Groups you chatted in recently show up in the Recent People tab 
--HG--
branch : product-engine
 2009-11-10 09:32:39 +02:00
angela 5292a31811 EXT-2078 2009-11-10 14:45:10 +08:00
Ramzi Linden 4204cce0ce merge 2009-11-10 13:17:26 +08:00
Ramzi Linden 729e0b1252 I18N: several nodes in XUI have no name= or a duplicate name=, thus cant be localized. 
Notifications console was listed twice in the Develop>Console menu
 2009-11-10 13:10:15 +08:00
angela ae27a93395 Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 12:15:42 +08:00
Ramzi Linden 5662a8d126 DEV-35097 final check in XUI for instances of the nonapproved terms "2nd Life", "1st Life", "SLURL" 2009-11-10 12:07:42 +08:00
Ramzi Linden cf7fdf86bf Develop>XUI>Send Test IMs: Lets not poke fun of a resident tradition in the public beta. Also it should test a sentence that wraps. Ideally it would also test a string with double-byte characters but I dont know how to do that. 2009-11-10 11:50:01 +08:00
angela 6106c9a7da Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 10:48:17 +08:00
angela c84624b2e9 clean up include llfontgl 2009-11-10 10:47:53 +08:00
Monroe Linden ca1356d465 LLViewerMediaImpl now keeps track of which instance is the current parcel media instance. 
The active parcel media instance always gets priority over other inworld media.
 2009-11-09 18:41:55 -08:00
Rick Pasetto f4186b6d3d PARTIAL FIX (workaround) DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have a contract conflict 
Review #31

So, here's what was happening, briefly:

- LLMediaEntry::setWhitelist() would be a no-op if given an LLSD that did not have a WHITELIST_KEY
- LLMediaEntry::asLLSD() would render the LLMediaEntry *without* a WHITELIST_KEY if the whitelist was empty

Therefore, when the viewer marshalled an LLMediaEntry for the server, it would send it without a WHITELIST_KEY. When the server got it, it would not erase the last value.

This is actually a workaround: it patches asLLSD() with an LLSD::emptyArray() if the key is not there. However, this should be fixed on the server: in either or both of the following ways:

1) LLMediaEntry::setWhitelist() should not be a no-op if the LLSD has no WHITELIST_KEY: it should erase the whitelist
2) LLMediaEntry::asLLSD() should render an empty whitelist in WHITELIST_KEY as an empty array

Note that both could be done and still work.

A unit test should and will be written next.
 2009-11-09 18:17:42 -08:00
Palmer 4be7fa99e7 Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-09 17:24:24 -08:00
Monroe Linden 312e7d21a4 Refinement to my previous commit: 
Created LLViewerMediaImpl::unload(), which unloads the media and clears internal state (such as the last-navigated URL) to keep it from getting reloaded.

LLViewerMedia::updateMediaImpl() now calls unload() on the impl instead of just using destroyMediaSource().
 2009-11-09 17:11:13 -08:00
brad kittenbrink 115dd2b09c Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0. 2009-11-09 20:08:30 -05:00
Rick Pasetto ebbb468a79 FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply" 
This change gets rid of the crufty (and confusing) "apply()"
functions from llpanelmediasettings*.  Those functions were
never being called, yet changes were being made in them.

Instead, I added "preApply()" and "postApply()" to each of
these panels, which the floater (who really does the "apply()"ing)
now calls before and after it applies the changes to the
media data.
 2009-11-09 16:56:33 -08:00
Palmer ae3003927f Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-09 16:27:54 -08:00
Palmer ed43195ee0 Dev-42424 Turning on impostors for intel cards above 965 2009-11-09 16:24:58 -08:00
Monroe Linden caadf0be39 Fix for DEV-42029 (changing media on multiple faces can make a zombie SLPlugin). 
Made LLViewerMedia::updateMediaImpl() unload the impl's media plugin when the current URL goes empty.

Made LLVOVolume::syncMediaData() call removeMediaImpl() if the media data gets deleted.
 2009-11-09 16:19:33 -08:00
richard 3b2d9f63e3 merge 2009-11-09 16:14:52 -08:00
Lynx Linden 17ab5928c2 DEV-41317 DEV-42311: Enabled the "Call" button in more side panels. 
The various People panels now have Call buttons that work. Currently
we only support single selection of users in lists for P2P voice chat.
Multiple selection for ad-hoc chat is next...
 2009-11-10 00:10:44 +00:00
Brad Payne (Vir Linden) b6de723de0 merge 2009-11-09 19:06:51 -05:00
James Cook 116f1601bd merge 2009-11-09 16:04:48 -08:00
richard 2bc97bd68a renamed LLLayoutStack::idle to LLLayoutStack::updateClass 
converted mWorldViewPlaceholder to a LLHandle<LLView>
improved layout of panel_bottomtray

reviewed by James
 2009-11-09 16:01:21 -08:00
James Cook 2f4174692e DEV-42409 Email snapshot now fills in sender email address as before. 
Sending now works.
Reviewed with Ambroff.
 2009-11-09 16:00:46 -08:00
James Cook 668ba958c7 Disabled saving notifications to disk because the load code hasn't worked for months, it spams the logs, and it hits the disk. 
Discussed with Q, the author.
 2009-11-09 15:59:53 -08:00