summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-10-05Merging due to changes since my last pull.Monroe Linden
2009-10-05Fixes for a different class of plugin failures (where loading the plugin dll ↵Monroe Linden
fails) causing an error message loop: Made LLPluginProcessParent differentiate between failures launching/loading the plugin and failures after the plugin has been loaded. This allows us to handle launch failures differently, since retrying is unlikely to fix them. Added new media event MEDIA_EVENT_PLUGIN_FAILED_LAUNCH to indicate a launch failure. Added a case for the new event to LLViewerMediaImpl::handleMediaEvent() that sets the "failed init" flag to prevent retries.
2009-10-05mergeMark Palange (Mani)
2009-10-05Fix for EXT-1301 (media_plugin_webkit dialog opens on loading the login page ↵Monroe Linden
and cannot be closed).
2009-10-05merge with latest from lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-05Minor tweaks to fix up viewer_manifest.Mark Palange (Mani)
-bad tcmalloc handling indentation -added nsis path for x64 windows
2009-10-05Mergeskolb
2009-10-05EXT-1225 EXT-1187 Unable to submit resident name in "Choose Resident". ↵James Cook
Input field was incorrectly changed to text_editor from line_editor, so I switched it back. Not reviewed.
2009-10-05DEV-39444 Media size only goes to 2000 x 2000skolb
reviewed by Callum
2009-10-05Disable "bounceBack" if nav permissions are refusedRick Pasetto
2009-10-05DEV-40650: Refactor llmediadataresponder and llmediadatafetcher into a ↵Rick Pasetto
single reusable class CC Review #7 (monroe) LLMediaDataResponder and LLMediaDataFetcher were helpful classes that interacted with each other, but they were not general enough to cleanly be used for all media service interaction. This change refactors these classes into one (in fact, it is closer to a complete rewrite): LLMediaDataClient. This class has the following design points: - You subclass from it when you want to specialize the responder, and then subclass from LLMediaDataClient::Responder if desired - It has a few inner classes: - LLMediaDataClient::Request, which now holds all of the data pertaining to a request, including retry counts - LLMediaDataClient::Responder, which is now the LLHTTPClient::Responder - LLMediaDataClient::PriorityQueue, which is now a STL priority_queue of Request objects. - LLMediaDataClient::QueueTimer, which is the timer that fires to peel off queue items - LLMediaDataClient::Responder::RetryTimer, which is the timer that is used when 503 errors are received. The encapsulation of these inner classes is a lot cleaner and better reflects the scope of their responsibilities. By and large, the logic hasn't really changed much. However, now there are two subclasses of LLMediaDataClient: one for the ObjectMedia cap and the other for the ObjectMediaNavigate cap. (I decided it was overkill to make three subclasses, one each for GET, UPDATE, and NAVIGATE, but we could still do that). LLVOVolume now instantiates both of these classes as statics (and destroys them on shutdown). They now have very simple API: - LLObjectMediaDataClient::fetchMedia(LLVOVolume*) fetches the media for the given object - LLObjectMediaDataClient::updateMedia(LLVOVolume*) sends an UPDATE of the media from the given object - LLObjectMediaNavigateClient::navigate(LLVOVolume*, U8 texture_index, const std::string &url) navigates the given face (texture_index) on the given object to the given url.
2009-10-05small change to turn off ShaderLoading debug loggingRick Pasetto
2009-10-05Fix viewer-2 build due to duplicate lines in a header merge.James Cook
2009-10-05Tweak inspector tooltip icon spacing.James Cook
2009-10-05merge -r 1890-1893 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 * Bugs: EXT-1217, EXT-1274, EXT-1272 * Dev: EXT-1101
2009-10-05merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1887 https://svn.aws.productengine.com/secondlife/pe/stable-2@1888 -> viewer-2.0.0-3 * Bugs: EXT-1148 * New Dev: EXT-1140
2009-10-04EXT-1224 Inventory list uses ugly fake-italicsAdam Moss
Reviewed by Richard.
2009-10-04Changed license to Viewer GPL to try to fix the Linux build export. Code ↵James Cook
consists of 4 function stubs, I don't think it's proprietary/internal.
2009-10-04Removed a couple debug statements we no longer need.James Cook
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
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-03fix for DEV-40559: viewer crash when media texture appears while parcel ↵Xiaohong Bao
media is loading.
2009-10-02DEV-38978: remove reference to parcel owners in help textRick Pasetto
2009-10-02DEV-38453 (part4) Modernize the foreign languages byRamzi Ramey
- moving some existing translations into strings.xml - deleting sentences that were removed from EN in notifications.xml - converting structures in floater_god_tools.xml NO CHANGES TO ENGLISH
2009-10-02Moved a couple of C++-specific warning flags from GCC_WARNINGS to ↵Monroe Linden
GCC_CXX_WARNINGS. This fixes a couple of non-fatal warning messages about unknown flags on the mac.
2009-10-02EXT-261: Labels in /character/avatar_lad.xml are not localizableRamzi Ramey
- there were a bunch of missing strings from the original fix, causing a MissingString(..) error to the user
2009-10-02DEV-40452 Correct linguistic consistency in the LSL editor tooltipsRamzi Ramey
- Set these tooltips for translate="false". We have decided not to localize these tooltips at this time.
2009-10-01merge of latest lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-01Color changes to overhead info, colors file cleanup.Erica Olsen
2009-10-01Merge fix, line was deleted.Leyla Farazha
2009-10-01L10N: cleanup text only, NO CODE changedRamzi Ramey
- G*d kills a kitten every time you put a hard return in the middle of a localizable sentence.
2009-10-01unborking build.Leyla Farazha
fixed lltransientfloatermgr.cpp addFocusChangeCallback commenting out LLFLoaterIM setFocusLostCallback for now.
2009-10-01DEV-40452 Correct a FEW MORE inconsistencies in the 3 new LSL editor tooltipsRamzi Ramey
- string changes only, NO CODE changed.
2009-10-01linux updater fixes - use the same new standard substitution strings as the ↵Adam Moss
viewer.
2009-10-01merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160 * Changes: EXT-1139 (places context menu)
2009-10-01EXT-332: Updated the visual style of the Buy L$ floater based onMartin Reddy
Erica's design. Now any errors during the L$ purchase process will give you a nice prompt to visit the SL website. Replaced all user-visible references to the illegal term "currency" with the term "L$". Also fixed an outstanding bug with this floater: if you clicked the Buy button but then cancelled the confirmation dialog, then the Buy button would remain disabled. Now the Buy button is only disabled during periods when you actually cannot buy. Added initial support for local currencies, with the use of a new [LOCALAMOUNT] field in the XUI files. When the XML-RPC server can actually return local currency details, we can hook this up by just changing llcurrencyuimanager.cpp. Discussed XML-RPC interaction with Morpheus. Thanks to Erica for the images and first cut at the XUI.
2009-10-01merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 * Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816 * Major Bugs: EXT-1142 (timeout during login due to processing group IMs) * Changes: EXT-1216 (minimize message well)
2009-10-01DEV-39995: the help browser would crash on open if the media ctrlMartin Reddy
returned no media plugin for text/html (NULL dereference), which seems to be happening in viewer-2.0.0-3 for me at the moment. Clearly there's not too much to do if we can't display HTML, but this fix will at least stop the help browser from crashing.
2009-10-01EXT-1251: strip leading/trailing whitespace from user input in theMartin Reddy
navigation bar when trying to access if the input is a valid SLURL.
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01L10N: typo and inconsistency in a tooltip of panel_login.xmlRamzi Ramey
2009-10-01DEV-40702 update viewer2 vivox sdk to v3Adam Moss
2009-09-30DEV-14830 add'l fixRamzi Ramey
Copy-paste caused duplicate control and widget names in the script errors checkbox & radio buttons; Need to fix this before code is written for it. Need a unique name= for localization
2009-09-30DEV-39781 VWR-15246: LSL compiler typo in the tooltip for 'attach'Ramzi Ramey
- edited 2 words in the file
2009-09-30DEV-40452 VWR-15527: Correct small errors and linguistic consistency in the ↵Ramzi Ramey
LSL editor tooltips - also fixes the specific cases of VWR-3766, VWR-1794 - string changes only, NO CODE changed. - this is needed so that we can begin the Localization round
2009-09-30DEV-35039 Viewer 2.0 Help System - Viewer DevelopmentAdam Moss
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30Cherry pick of simple fix for duplicate inventory folders (one non working) ↵Eric Tulla
in some inventory panel views. Result of: svn merge -c 134827 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-09-30converted focus change callbacks to use signalsRichard Nelson
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt reviewed by Leyla
2009-09-29MergeBryan O'Sullivan
2009-09-29Syncing latest appearance work from avatar pipeline into viewer2.0.Eric Tulla
Result of: (NO CONFLICTS) svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .
2009-09-29Removing script errors from viewer filesLisabeth Pardi
DEV-14830