Commit Graph

58 Commits (ce3ff8d279bcdc2b388440b2df63fc690c27dfbc)

Author SHA1 Message Date
maxim@mnikolenko e4c43d6bed MAINT-3247 FIXED Check that gfilter is not NULL. 2013-10-04 13:43:45 +03:00
Graham Madarasz (Graham Linden) b8a1fd33f5 Try all you want multichar constant, but you'll never be a string to me! (fix mac build errors from 'curious' filepicker literals) 2013-09-26 10:12:33 -07:00
simon_linden d3625d0b67 Merge downstream code 2013-09-19 15:30:34 -07:00
Cinder Biscuits 5b7da1998a BUG-3848: send_agent_resume() was not being called after snapshot. 2013-09-10 22:12:18 +00:00
simon_linden e2019e8a3b Merge downstream code with viewer-release 2013-09-09 16:17:16 -07:00
callum_linden 2503f825ec MAINT-2897 Need to be able to save textures from inventory as PNG 2013-08-14 15:50:37 -07:00
dmitrykproductengine be9d946375 MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNG 2013-08-14 11:32:23 +03:00
Geenz 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -04:00
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
Aura Linden 3f9a1da042 Recovered changes for dirpicker and filepicker 2013-01-23 10:41:52 -08:00
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00:00
Oz Linden 10275e9bb1 corrected build problem detected on Mac 2012-06-15 17:40:07 -04:00
Kitty Barnett f15fc05fd2 STORM-276 Ease-of-use importing of Open Office dictionary extensions 2012-06-15 20:47:02 +02:00
Kitty Barnett 20210455f5 STORM-276 Dictionary import functionality and floater 2012-06-04 16:10:32 +02:00
Oz Linden 633bd44b4a merge changes for vmrg-225 2012-03-09 12:58:50 -05:00
Jonathan Yap 449d2b106f STORM-1803 Fix syntax error that the Windows compiler did not complain about 2012-02-07 10:25:18 -05:00
Jonathan Yap 619f737abb STORM-1803 Adding raw anim file upload support 2012-01-29 15:34:51 -05:00
Vadim ProductEngine 8f60dc0136 EXT-1836 FIXED Avoid assigning NULL to an std::string. 2012-01-23 17:50:04 +02:00
Ima Mechanique 032a5e4572 Replacing file filter for windows that was mistakenly removed. 2011-12-25 23:09:32 +00:00
Ima Mechanique 9890e5cbed STORM-1708 Darwin UI additions 2011-12-07 21:37:08 +00:00
Ima Mechanique 5535722ea5 STORM-1708 Linux UI additions 2011-12-01 12:31:56 +00:00
Ima Mechanique eeefec394c Changes to filter out tabs from file load and to test if loading/saving should be allowed. 2011-11-23 01:30:15 +00:00
Ima Mechanique b28492fbff STORM-1708 Adding ability to save/load scripts from file. 2011-11-17 23:17:26 +00:00
Richard Linden d0cda13235 EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewport
Ctrl+Shift+U now toggles UI and hides floaters
refactored main_view.xml
made all members of llviewerwindow private
2011-10-11 22:49:00 -07:00
Loren Shih bfbd8e22cb Automated merge up from viewer-development into mesh-development 2011-02-08 12:46:43 -05:00
paul_productengine 1651190c80 STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg)
- Added filter "jpg" for "Save As..." dialog so that *.jpg files can be seen as well as *.jpeg.
2011-02-01 18:39:24 +02:00
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
callum 266b3843b7 EXP-94 Disable local file system access 2010-09-21 16:41:06 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 68991a2cce Mac and linux fix? 2010-03-08 22:16:08 -06:00
Dave Parks b26d580346 little bool 2010-03-08 21:50:24 -06:00
Dave Parks 38334e22e3 Multi-threaded file dialog 2010-03-08 21:33:19 -06:00
Tofu Linden 5a34cf1af8 Merge from viewer2 trunk. 2010-01-28 12:48:48 -08:00
Tofu Linden 7ed71ecf71 CID-399
Checker: UNINIT_CTOR
Function: LLFilePicker::LLFilePicker()
File: /indra/newview/llfilepicker.cpp
2010-01-26 17:35:25 -08:00
Karl Stiefvater (qarl) 7fa6982520 super importer stuff (gui, texture upload, etc.) 2009-11-09 17:57:21 -06:00
David Parks 3e80fa3dbc Sync up with render-pipeline-7 ignore-dead-branch 2009-11-02 19:55:37 +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
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
Steven Bennetts afe61eb994 QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
James Cook ed386ae547 merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
Steven Bennetts 903292ba67 merge -r 78989:80279 Branch_1-19-0-Viewer-> release
Changes from 1.19.0.2 and 1.19.0.3

DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031    	Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066    	Checking to select a role does not enable the apply button
DEV-8809    	stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans.  svn merge -r77376:77377 sl-parcelmedia-3.  OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 	Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 	Alt and left/right arrow keys dont move you between tabs
DEV-10093 	Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 	Redocking the Contact list causes the communicate ui to get ugly
DEV-8131  	 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 	Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)
2008-02-19 23:12:34 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Adam Moss 96830697b2 SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
revamp.

Passed by QA.  Reviewed by bos.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938
-> release
2007-09-10 20:15:48 +00:00