summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09Added tag 3.4.4-release for changeset e1bb1ae7d8b1Oz Linden
2013-01-09Merge. Pull viewer-development in prior to filing DRTVWR merge request.Monty Brandenberg
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09tag merge of DRTVWR-276Oz Linden
2013-01-09More merge cleanup.Dave Parks
2013-01-09More merge cleanup.Dave Parks
2013-01-09Merge cleanup.Dave Parks
2013-01-08Big change set:Geenz
- LLAppDelegate header relocated to LLWindow. Definition is still present in secondlife-bin (for compatibility reasons when loading a nib). - Return key handling fixed. - Command key now acts the same as the control key by issuing control character codes when the command key is pressed. - We now retrieve the window pointer directly from the app delegate in LLWindow.
2013-01-08merge changes for DRTVWR-277Oz Linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08tag merge of DRTVWR-277Oz Linden
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-08tag merge of DRTVWR-250Oz Linden
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07merge with headcallum_linden
2013-01-04pull back 3.4.4-beta4 tagOz Linden
2013-01-04Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95Oz Linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03tag merge of DRTVWR-275Oz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2013-01-02Fixed the enter and return keys not being sent appropriately as unicode ↵Geenz
characters.
2013-01-02OS X crash on startup fix: always ensure that mMainLoopInitialized is ↵Geenz
initialized properly within LLAppViewer::init(). Otherwise, the viewer will sporadically crash on start up.
2013-01-02Crash on exit fix + general code cleanup in LLWindowMacOSX.Geenz
2013-01-02merge changes for DRTVWR-269Oz Linden
2013-01-02tag merge of DRTVWR-269Oz Linden
2013-01-01More things in this commit:Geenz
- Removed the callback system in favor of simply defining functions in a header to later be implemented in whichever file is most convenient for what we want to do (i.e., calling LLWindow callbacks within LLWindowMacOSX, setting cursors in llwindowmacosx-objc.mm, etc.) - Viewer shutdown now works appropriately - Added a bit of debugging code to test if a key has been handled by the UI or not (useful for tracking down the mystery of the enter key not being handled) - Setup a cocoa quit handler within the application delegate that intercepts any termination requests
2012-12-29Added requisite SecondLife.nib file required for compiling the viewer.Geenz
2012-12-29Huge amount of refactoring to use Cocoa here:Geenz
- Updated to .xib format. To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory. - xib file now defines the viewer's window. VIews are still being pragmatically added to the main window. This may change in the future. - LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X. This probably needs a bit more work. - Event handling still needs more work to work within a timer based event loop. It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse. - Carbon has been purged from the viewer's startup, and from LLWindow entirely. There's likely still a few odds and ends fragmented throughout the viewer and its dependencies. Need to track these down. - LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate. - Fullscreen support has been implemented for OS X 10.7+ This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete. From here, it's mostly just bug hunting and fixing.
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-28tag merge of DRTVWR-272Oz Linden
2012-12-27merge changes for new Havok licenseOz Linden
2012-12-25merge changes for DRTVWR-273Oz Linden
2012-12-25tag merge of DRTVWR-273Oz Linden
2012-12-21SH-3357 Texture fetch debugger not running correctly under drano-Monty Brandenberg
http phase 1 Some missing counter initialization kept the debugger from entering the startup state giving the appearance of a do- nothing floater. Also found some unbound recursion that might need looking at in the future. (There's a comment.)
2012-12-21SH-3331 Fix incorrect overrun message when sending body with HTTPMonty Brandenberg
request. During readcallback, would generate an overrun-type message about reading position beyond end-of-data. Mistake was is messaging when state is exactly at end of data (which is expected) versus an overrun. Both result in declaring end-of-data to libcurl. Also changed some of the status logging for the metrics payload to be less chatty on success, more informative on error.
2012-12-21merge accidental commit and its fixOz Linden
2012-12-21MAINT-2168: Backed out changeset fb93eecd462d, reapply fixNat Goodspeed
Now that we've backed out the premature push, reapply the actual fix to propagate it appropriately.
2012-12-21MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repoNat Goodspeed
This changeset was prematurely pushed to the wrong repository. Back it out to propagate it the right way.
2012-12-21MAINT-2168: fail with real message if required var PORT not set.Nat Goodspeed
llhttpclient_test.cpp is only supposed to be run by test_llsdmessage_peer.py, as specified in llmessage/CMakeLists.txt. test_llsdmessage_peer.py sets the environment variable PORT before running INTEGRATION_TEST_llhttpclient. While it's not yet clear under what circumstances INTEGRATION_TEST_llhttpclient could find PORT not set (getenv() returning NULL), it's obvious that in that case, the previous code might well crash. Make it at least fail with an explanatory message rather than a mysterious large negative integer. In theory, occurrences of that message could help us solve the underlying issue.
2012-12-20merge changes for 3.4.4-beta3Oz Linden
2012-12-20Added tag 3.4.4-beta3 for changeset 2f8a3ef687bcOz Linden
2012-12-20merge changes for DRTVWR-271Oz Linden
2012-12-20tag merge of DRTVWR-271Oz Linden
2012-12-20Reverted mac updaterAura Linden
2012-12-20There goes a month of workAura Linden