summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-08-01ACME: add SLShareHost variable to settings.xml, which allows changing the fb ↵Gilbert Gonzales
service host location as needed.
2013-08-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
2013-08-01ACME-773 Making cookie clearing occur during disc and connect.Gilbert Gonzales
2013-08-01MAINT-2949 : Objects across the sim border do not render when approached. Addedsimon
missing code block from previous change as per Dave P's advice
2013-07-31ACME-778: Adjusted the facebook code so that isConnected() does not depend ↵Gilbert Gonzales
on state changes. Instead it returns true if the user successfully connected and false if the user successfully disconnected.
2013-07-31ACME-757: Switching back to pdp15 host for testing.Gilbert Gonzales
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30ACME-757 : Change the hard coded url to fbc service (still a hack)Merov Linden
2013-07-30MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer ↵maksymsproductengine
goes blank if location is selected and a menu item is seleted
2013-07-30Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100Steven Harrison (steven)
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-29ACME-755 : Fix erasing in live std::map (breaks build on Mac and Linux).Merov Linden
2013-07-26mergeGilbert Gonzales
2013-07-26ACME-755 Clear FB cookies by removing cookies from the .facebook.com domainGilbert Gonzales
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed
2013-07-26CHOP-962: merge code-review fixes with viewer-releaseNat Goodspeed
2013-07-26CHOP-962: per code review, comment that other code relies on "Global".Nat Goodspeed
The comment advises grepping for "Global" rather than specifically pointing to llcontrol.cpp because that's NOT the only place that relies on the name "Global"! Besides, by the time someone does want to change the name, still other such dependencies could've crept in.
2013-07-25ACME-745 : Fix : Do not oversanitize the logged URLs...Merov Linden
2013-07-25ACME-773 Remove the 'Use another account...' in the ACCOUNT panelGilbert Gonzales
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25Kill all the vivox logsAura Linden
2013-07-24mergeGilbert Gonzales
2013-07-24ACME-602 Remove logging code that reveals use of suggested friendsGilbert Gonzales
2013-07-24added default sourceid and check that sourceid is not blank, hoping to get ↵JJ Linden
the windows builds to recognize the value
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-23Pull merge from lindenlab/viewer-fbcMerov Linden
2013-07-23ACME-734 : MoaP : Move the secure lock icon to the left on Media on Prim ↵Merov Linden
address bar
2013-07-23changing facebook floater title to match spec. The title was 'FACEBOOK' and ↵Gilbert Gonzales
is now 'POST TO FACEOOK'
2013-07-23ACME-734 : Fix issues with the lock icon when editing the address bar. ↵Merov Linden
Generalize the secure browsing UI.
2013-07-23ACME-677 Make the 'Connect...', 'Disconnect' and 'Use another account...' ↵Gilbert Gonzales
buttons disabled upon clicking
2013-07-23CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not ↵Mnikolenko ProductEngine
from group or friend.
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-22CHOP-962: Emit unrecognized-var log message only for Global settings.Nat Goodspeed
LLControlGroup::loadFromFile() can of course detect which LLControlGroup instance it's loading. We only want to log unrecognized settings variables in LLControlGroup "Global". Settings for "Don't show me this again" notifications are in group "Warnings".
2013-07-22mergeGilbert Gonzales
2013-07-22ACME-729 Implement the 'Use another account...' buttonGilbert Gonzales
2013-07-22ACME-734 : Fix: Do not log empty URLs, refocus on page if the focus was thereMerov Linden
2013-07-22Pull merge from lindenlab/viewer-fbcMerov Linden
2013-07-22ACME-741: Fixed: Do not try to get FB account info when the user is not ↵Merov Linden
connected to FB (otherwise, it autoconnects...)
2013-07-22mergeGilbert Gonzales
2013-07-22ACME-726: Display 'You are connected to Facebook as' text and the user's ↵Gilbert Gonzales
account name
2013-07-22Turn off logging.Aura Linden
2013-07-21ACME-734 : Fix : Factorize and clean up web browsing address, log and ↵Merov Linden
history code
2013-07-19ACME-734 : Fix : Feed browsing history but without the query partMerov Linden
2013-07-19ACME-734 : Fix forgotten useless callMerov Linden
2013-07-19ACME-734 : Fix : Continue to log but just skip the query partsMerov Linden
2013-07-19Pull merge from lindenlab/viewer-fbcMerov Linden
2013-07-19ACME-734 : Suppress the green https experiment, prevent logging urls when ↵Merov Linden
skipping history, allow temporary url for display purposes