summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-01PE mergeTofu Linden
2010-04-01Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-04-01updating some back-end functionality that will come in handy as we bring the ↵Nyx (Neal Orman)
UI up to date with multiwearables. code reviewed by Seraph and Vir.
2010-04-01automated mergeLoren Shih
2010-04-01BOOL->bool on llassettype.*Tofu Linden
2010-03-31Added copyright header to new unit test.Monroe Linden
2010-03-31Added unit test for LLPluginCookieStore.Monroe Linden
2010-03-31Fixed a problem with LLPluginCookieStore that would have caused problems ↵Monroe Linden
when adding multiple cookies with setCookies(), setAllCookies(), and setCookiesFromHost().
2010-03-31mergeCG Linden
2010-03-31Include channel names in update_version_files.py invocation to fix bad ↵CG Linden
viewer channel name.
2010-03-31EXT-3604 : Accordion folders should show "Loading..." when fetching contentsLoren Shih
Superficial cleanup of LLFolderViewItem::draw. No functionality change.
2010-03-31Enable OpenID auth in the embedded webkit browser.Monroe Linden
Extract openid_url and openid_token tokens from the login response in process_login_success_response() and send them to LLViewerMedia if they're present. Added LLViewerMedia::openIDSetup() to receive openid_url and openid_token, and added code to LLViewerMedia to do a POST with LLHTTPClient, retrieve the resulting cookie, and push it into the central cookie store. Also made sure the OpenID cookie gets re-added when the cookie store is cleared. Added LLPluginCookieStore::setCookiesFromHost() to properly add a cookie that may not have a domain set. Made LLPluginCookieStore::Cookie::parse() add missing domain and path fields to cookies as necessary. Fixed an issue where carriage returns in the string passed to LLPluginCookieStore::setCookies() or LLPluginCookieStore::setCookiesFromHost() would cause a parse failure. Reviewed by gino and callum at http://codereview.lindenlab.com/1254001
2010-03-31mergeBrad Payne (Vir Linden)
2010-03-31asset request logging for DEV-47362 investigation.Brad Payne (Vir Linden)
2010-03-31EXT-6666 : Enable debug avatar textures in God, versus non-Release, modeLoren Shih
2010-03-31automated mergeLoren Shih
2010-03-31automated mergeLoren Shih
2010-03-31EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionaryLoren Shih
Took out some ugly case statements and stuck those functions into the asset dictionary instead. This makes the code a lot more centralized/extensible since if we ever add assets, it'll be clear that their fetch/knowable fields need to be added (versus that logic being in some obscure case statement).
2010-03-31merge from viewer-2-0Tofu Linden
2010-03-31recent crash regression fix from Seraph.Tofu Linden
2010-03-31Fix for crash in process_avatar_movement.Loren Shih
gAgentAvatarp pointer was being checked for null instead of the local avatarp.
2010-03-31EXT-2418 - improved cursors for sit/open/buy - the neglected Linux part.Tofu Linden
2010-03-30automated mergeLoren Shih
2010-03-30EXT-5916 : INFRASTRUCTURE: Move autopopulation code into its own separate classLoren Shih
Moved LLLibraryOutfitsFetch and LLInitialWearablesFetch
2010-03-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-03-30EXT-3529 : INFRASTRUCTURE : Move LLFindWearables code and others into ↵Loren Shih
LLInventoryFunctions These functions are defined in LLInventoryFunctions.h but their implementation is in LLInventoryBridge... moved everything to LLInventoryFunctions.
2010-03-30Rename to remove camelcase from llinventorymodelbackground files.Loren Shih
2010-03-30Rename to remove camelcase from llinventorymodelbackground files.Loren Shih
2010-03-30EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into ↵Loren Shih
llagentcamera Fix for S32/F32 mismatch.
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-03-30Rename to remove camelcase from llinventorymodelbackground files.Loren Shih
2010-03-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-03-30Rename to remove camelcase from llinventorymodelbackground files.Loren Shih
2010-03-30EXT-6633 enable demo of multiwearables codeNyx (Neal Orman)
cleaning up a merge conflict where HG didn't quite do the right thing.
2010-03-30EXT-6634 : INFRASTRUCTURE: Generic header file / #include cleanupLoren Shih
LLAgent.* cleanup Also took out some constants from llagent.cpp that aren't being used.
2010-03-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-03-30EXT-6633 enable basic multiwearables demoNyx (Neal Orman)
Fixed several areas of code that were not multi-wearables enabled. Specifically allowed for the wearing of created outfits that had links to multiple items of the same type. Such outfits can be created by dragging multiple items of the same type into an unworn outfit folder. When you wear the outfit, all items (up to 5 per type) should be worn. Does not affect right-click options or other buttons. Code reviewed by Vir.
2010-03-30EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include ↵Loren Shih
cleanup Took out unnecessary #includes from llagentcamera.*
2010-03-30EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into ↵Loren Shih
llagentcamera Orbit/Pan keys were already in llagentcamera. Pulled alt/walk/left/up/yaw/pitch into llagentcamera.
2010-03-30automated mergeLoren Shih
2010-03-30EXT-3414 : Move static backgroundfetch methods and variables to ↵Loren Shih
llinventorymodel subclass Created LLInventoryModelBackgroundFetch file for handling background fetch.
2010-03-30EXT-6589 "Are you sure you want to teleport.." dialog has broken ↵Tofu Linden
"[LOCATION]" tag
2010-03-30fix linux build error.Tofu Linden
2010-03-29Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the ↵Monroe Linden
HTTP_USER_AGENT) The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received. Made the handler for the set_user_agent message save the string in a member variable (mUserAgent). Initialize mUserAgent to the default string in the MediaPluginWebKit constructor. initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
2010-03-29Default MediaShowOnOthers setting to false.Monroe Linden
--HG-- branch : EXT-4880
2010-03-29mergeRichard Nelson
2010-03-29EXT-3258 - Viewer freezes while external web browser loads pageRichard Nelson
reviewed by Callum
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29VWR-17649 en_xui_changeEli Linden