Alexei Arabadji
c6cdd40c4e
fixed EXT-6373 Consecutive offer messages are unreadable in the IM log
...
replaced [NAME] with [NAME_SLURL] in friendship offer notification;
--HG--
branch : product-engine
2010-04-01 14:58:24 +03:00
Mike Antipov
25976eb3da
Merge from default branch
...
--HG--
branch : product-engine
2010-04-01 12:28:08 +03:00
Eugene Mutavchi
7f38ea1474
Fixed normal bug EXT-6659("Ctrl+A" combination allows selecting of several picks) - added check that multiple selection is allowed
...
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/146/
--HG--
branch : product-engine
2010-04-01 11:32:51 +03:00
Monroe Linden
68870a1f59
Added copyright header to new unit test.
2010-03-31 18:53:50 -07:00
Monroe Linden
e868159922
Added unit test for LLPluginCookieStore.
2010-03-31 18:51:09 -07:00
Monroe Linden
11b588c29c
Fixed a problem with LLPluginCookieStore that would have caused problems when adding multiple cookies with setCookies(), setAllCookies(), and setCookiesFromHost().
2010-03-31 18:50:20 -07:00
CG Linden
a1092147e0
merge
2010-03-31 15:25:04 -07:00
CG Linden
ac271e1d50
Include channel names in update_version_files.py invocation to fix bad viewer channel name.
2010-03-31 15:24:42 -07:00
Monroe Linden
5c19099622
Enable OpenID auth in the embedded webkit browser.
...
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-31 13:53:40 -07:00
Brad Payne (Vir Linden)
e504f89513
merge
2010-03-31 16:11:21 -04:00
Brad Payne (Vir Linden)
2208e6da2c
asset request logging for DEV-47362 investigation.
2010-03-31 16:09:34 -04:00
Loren Shih
fc8c4ea485
automated merge
2010-03-31 12:06:22 -04:00
Loren Shih
e5443c4e76
automated merge
2010-03-31 12:06:01 -04:00
Loren Shih
d4fef262bc
EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionary
...
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-31 12:05:51 -04:00
Tofu Linden
5038f1fb61
merge from viewer-2-0
2010-03-31 16:52:59 +01:00
Tofu Linden
8f5e094757
recent crash regression fix from Seraph.
2010-03-31 16:46:57 +01:00
Eugene Mutavchi
7263906f49
Fixed normal bug EXT-6541(snapshot preview opens before login curtain lifts) - changed the order of main view panels so the progress_view overlaps the snapshot_floater_view.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/144/
--HG--
branch : product-engine
2010-03-31 18:19:16 +03:00
Eugene Mutavchi
eff5d1fbff
No ticket, fixed Linux build.
...
--HG--
branch : product-engine
2010-03-31 18:16:24 +03:00
Loren Shih
b3bbc9d9ac
Fix for crash in process_avatar_movement.
...
gAgentAvatarp pointer was being checked for null instead of the local avatarp.
2010-03-31 11:05:23 -04:00
Tofu Linden
3e11f81b69
EXT-2418 - improved cursors for sit/open/buy - the neglected Linux part.
2010-03-31 15:24:10 +01:00
Paul Guslisty
e7bb78d76e
merge
...
--HG--
branch : product-engine
2010-03-31 17:00:30 +03:00
Paul Guslisty
1e74f573bb
Fixed normal bug EXT-6505 (Certain gear icon buttons should not have chevrons)
...
- Created an icon that is just the gear icon, no dropdown chevron in places where there is no context menu, notably in: Nearby media popover, Master volume popover and Edit Floater
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/137/
--HG--
branch : product-engine
2010-03-31 16:50:06 +03:00
Yuri Chebotarev
349bc84dfd
merge
...
--HG--
branch : product-engine
2010-03-31 16:49:26 +03:00
Yuri Chebotarev
0a0f6dec5f
fix for normal EXT-6346 SLapp group inspector link opens group profile instead
...
https://codereview.productengine.com/secondlife/r/138/
reviwed vsavchuk
--HG--
branch : product-engine
2010-03-31 16:46:16 +03:00
Vadim Savchuk
8ef5fd0e14
Fixed bug EXT-6628 IM floater: unable to open 'Pay' floater by click on 'Pay' button if floater height was reduced.
...
Reason: Height of the layout stack containing buttons was too small, hence
when you decrease the window height the bottommost buttons might move beyond
its container, becoming unclickable.
Fix: Increased height of the layout stack for it to reach the bottom of the
floater (occupying all visible area).
Reviewed by Sam: https://codereview.productengine.com/secondlife/r/141/
--HG--
branch : product-engine
2010-03-31 16:04:03 +03:00
Vadim Savchuk
58de782e08
Fixed bug EXT-4436 Clicking labels/text plays 'click' sound.
...
Disabled playing sound when a textbox is clicked.
Reviewed by Sam: https://codereview.productengine.com/secondlife/r/140/
--HG--
branch : product-engine
2010-03-31 16:01:50 +03:00
Mike Antipov
bba457e889
Merge from default branch
...
--HG--
branch : product-engine
2010-03-31 10:08:50 +03:00
Loren Shih
d99a7d2f1d
automated merge
2010-03-30 17:47:16 -04:00
Loren Shih
2e05cc588f
EXT-5916 : INFRASTRUCTURE: Move autopopulation code into its own separate class
...
Moved LLLibraryOutfitsFetch and LLInitialWearablesFetch
2010-03-30 17:39:16 -04:00
Nyx (Neal Orman)
98695056c2
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 16:49:35 -04:00
Loren Shih
d7002c0695
EXT-3529 : INFRASTRUCTURE : Move LLFindWearables code and others into LLInventoryFunctions
...
These functions are defined in LLInventoryFunctions.h but their implementation is in LLInventoryBridge... moved everything to LLInventoryFunctions.
2010-03-30 16:24:18 -04:00
Loren Shih
094700f499
Rename to remove camelcase from llinventorymodelbackground files.
2010-03-30 16:05:16 -04:00
Loren Shih
116c42750b
Rename to remove camelcase from llinventorymodelbackground files.
2010-03-30 16:03:48 -04:00
Loren Shih
715e38fb53
EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into llagentcamera
...
Fix for S32/F32 mismatch.
2010-03-30 16:01:17 -04:00
Loren Shih
909091cc0c
EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
...
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -04:00
Nyx (Neal Orman)
4270739741
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 15:45:53 -04:00
Loren Shih
856eccdb53
Rename to remove camelcase from llinventorymodelbackground files.
2010-03-30 15:45:29 -04:00
Nyx (Neal Orman)
56434c5542
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 15:42:30 -04:00
Loren Shih
bf49c0fcc4
Rename to remove camelcase from llinventorymodelbackground files.
2010-03-30 15:38:16 -04:00
Nyx (Neal Orman)
6d82b0c0a2
EXT-6633 enable demo of multiwearables code
...
cleaning up a merge conflict where HG didn't quite do the right thing.
2010-03-30 15:30:59 -04:00
Loren Shih
b0d2cd38f0
EXT-6634 : INFRASTRUCTURE: Generic header file / #include cleanup
...
LLAgent.* cleanup
Also took out some constants from llagent.cpp that aren't being used.
2010-03-30 15:21:53 -04:00
Nyx (Neal Orman)
cc3f4c1f59
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 15:20:37 -04:00
Nyx (Neal Orman)
dbcd12a4d1
EXT-6633 enable basic multiwearables demo
...
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-30 15:17:14 -04:00
Loren Shih
7a8c6a235e
EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include cleanup
...
Took out unnecessary #includes from llagentcamera.*
2010-03-30 15:05:48 -04:00
Loren Shih
b15e34b942
EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into llagentcamera
...
Orbit/Pan keys were already in llagentcamera. Pulled alt/walk/left/up/yaw/pitch into llagentcamera.
2010-03-30 14:21:20 -04:00
Vadim Savchuk
1751e6add7
Fixed gcc-4.1 build.
...
--HG--
branch : product-engine
2010-03-30 19:21:30 +03:00
Loren Shih
9ec2e86929
automated merge
2010-03-30 11:50:41 -04:00
Loren Shih
5861a2faf2
EXT-3414 : Move static backgroundfetch methods and variables to llinventorymodel subclass
...
Created LLInventoryModelBackgroundFetch file for handling background fetch.
2010-03-30 11:49:15 -04:00
Vadim Savchuk
b58e4164a6
merge
...
--HG--
branch : product-engine
2010-03-30 18:20:27 +03:00
Vadim Savchuk
3e23c04c9b
Merge from default branch
...
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00