summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-27CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.Nat Goodspeed
It seems that certain build hosts have an (obsolete? broken?) install of indra.util.llmanifest under the system Python. If we append the local repo indra/lib/python to sys.path, viewer_manifest.py pulls in the broken llmanifest. Prepend to sys.path instead to ensure we get the right one.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-07-19CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer ↵maksymsproductengine
notifications simultaneously when he accept/decline friendship offer
2013-07-17CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from ↵Mnikolenko ProductEngine
inventory onto avatar’s name in resident picker)
2013-07-16CHUI-978 FIXED Add Nearby chat history to the list of transcriptions if it ↵Mnikolenko ProductEngine
exists(to enable "Chat history" menu item for Nearby chat)
2013-07-10CHUI-984 FIX Clicking on voice icon no longer brings up voice volume sliderPavelK ProductEngine
2013-07-09CHUI-978 FIXED Load data from chat log file in separate thread to prevent ↵Mnikolenko ProductEngine
viewer freeze
2013-07-08CHUI-982 FIXED Clicking on conversation in conversation list to bring focus ↵maksymsproductengine
to conversation removes text entry prompt for chat bar
2013-07-02Pull merge lindenlab/viewer-releasemaksymsproductengine
2013-06-27CHOP-956: Add settings_install.xml to settings_files.xml.Nat Goodspeed
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml.
2013-06-26ACME-621 : Add autoconnect to FBC in the social floater, disable Post ↵Merov Linden
buttons when not connected.
2013-06-26mergeGilbert Gonzales
2013-06-26ACME-628 Removing unneeeded headers files from llsnapshotpreview, llsnapshot ↵Gilbert Gonzales
and llfloatersocial
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-25Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-25ACME-497 : Refactor the LLSocialCheckinPanel code a bit to make it more ↵Merov Linden
maintainable
2013-06-25mergeGilbert Gonzales
2013-06-25ACME-586: Fixing the file size appearing as red. Was using the postcard ↵Gilbert Gonzales
snap-shot type which is used for e-mailing pictures (red indicates going over 1mb).
2013-06-25Merge pull from lindenlab/viewer-fbcMerov Linden
2013-06-25ACME-612 : Implemented a loading indicator for the map tile when it's ↵Merov Linden
loading, also disable the checkbox during that time
2013-06-25used default SL logo for image-less checkins for ACME-613Cho
2013-06-25CHOP-957: Stop looking for, or parsing, Mac arguments.txt file.Nat Goodspeed
2013-06-25CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.Nat Goodspeed
However, for backwards compatibility, continue to recognize and discard --skip-gridargs switch.
2013-06-25ACME-592 Clicking 'Post' should close the Facebook floaterGilbert Gonzales
2013-06-25mergeGilbert Gonzales
2013-06-25ACME-588 Make 'Post' button post to facebookGilbert Gonzales
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-25Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-25ACME-580, ACME-572, ACME-591 : Added a toast notification when posting to ↵Merov Linden
Facebook successfully
2013-06-25mergeCho
2013-06-25made status update post button disabled for ACME-571Cho
2013-06-25ACME-585 Populate the drop-down box with picture resolutionsGilbert Gonzales
2013-06-25ACME-587 Add the 'refresh' button on top the imageGilbert Gonzales
2013-06-24mergeGilbert Gonzales
2013-06-24ACME-593: Now the photo tab of the facebook panel displays a screenshot ↵Gilbert Gonzales
based upon when the facebook floater was opened.
2013-06-24Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-24ACME-582 : Checkin feature: Implement the loading and displaying of map ↵Merov Linden
tiles in the LLIconCtrl
2013-06-25made status update actually post to Facebook, for ACME-569 and ACME-573Cho
2013-06-24CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.Nat Goodspeed
Instead of generating viewer command-line switch overrides into the Windows shortcut, an arguments.txt file on Mac, or a gridargs.dat file on Linux, generate a platform-independent settings_install.xml file containing 'sourceid' key (if 'sourceid' found in TeamCity environment variables). All command-line override switches previously found in the aforementioned files have happily become moot.
2013-06-24ACME-497 : Clean up the xml code for checkin to use a proper icon widget and ↵Merov Linden
add a decent default image for it
2013-06-24MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not ↵Graham Madarasz (Graham)
slow down on ATI on Mac
2013-06-24ACME-593 Populate the image with the actual screenshot image: Placed ↵Gilbert Gonzales
LLSnapshotLivePreview class into file llsnapshotlivepreview.h/cpp so that it could be utilized by other classes.
2013-06-23ACME-497 : Working implementation of Checkin though couple of bugs to fix ↵Merov Linden
and no visible map in the UI
2013-06-22Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-22ACME-497 : All xml work for the Checkin featureMerov Linden
2013-06-22tweaked numbers to look more like mockup for ACME-568Cho
2013-06-22added text and buttons for update status tab for ACME-568Cho
2013-06-22mergemberezhnoy
2013-06-22build fixmberezhnoy
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks