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
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
4270739741
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 15:45:53 -04:00
856eccdb53
Rename to remove camelcase from llinventorymodelbackground files.
2010-03-30 15:45:29 -04:00
56434c5542
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 15:42:30 -04:00
bf49c0fcc4
Rename to remove camelcase from llinventorymodelbackground files.
2010-03-30 15:38:16 -04:00
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
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
cc3f4c1f59
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-30 15:20:37 -04:00
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
7a8c6a235e
EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include cleanup
...
Took out unnecessary #includes from llagentcamera.*
2010-03-30 15:05:48 -04:00
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
1751e6add7
Fixed gcc-4.1 build.
...
--HG--
branch : product-engine
2010-03-30 19:21:30 +03:00
9ec2e86929
automated merge
2010-03-30 11:50:41 -04:00
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
b58e4164a6
merge
...
--HG--
branch : product-engine
2010-03-30 18:20:27 +03:00
3e23c04c9b
Merge from default branch
...
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
b182122546
EXT-6589 "Are you sure you want to teleport.." dialog has broken "[LOCATION]" tag
2010-03-30 15:51:40 +01:00
69e6c4d947
EXT-6693 - [crashhunters] crash in LLPopupView::handleMouseEvent
2010-04-07 16:29:06 -07:00
7b801ca15d
EXT-6589 "Are you sure you want to teleport.." dialog has broken "[LOCATION]" tag
2010-03-30 15:51:40 +01:00
088a878f42
fix linux build error.
2010-03-30 15:43:28 +01:00
67a7112a7c
Completed normal task EXT-3397 (Hide well buttons if there are no active IM sessions and unresolved notifications)
...
* Implemented hiding of bottom tray's wells if there are no active IMs or unresolved notifications (via LLBottomTray::notifyParent)
* Also refactored initializing code to init a pointer to a chiclet panel and map with bottomtray parts in postBuild BEFORE initializing start wells' visibility.
For now minimal viewer width when all buttons are still visible (and have non-truncated labels in the 'EN' locale) with opened sidetray is 1041 px; with short Speak button (without text label) is 990 px. (with implemented patch in https://codereview.productengine.com/secondlife/r/126/ )
Each well button takes 37 px (with a padding). So, they can free up to 74 px when invisible.
reviewed by Vadim at https://codereview.productengine.com/secondlife/r/136/
--HG--
branch : product-engine
2010-03-30 17:42:05 +03:00
8ee0bdbd1f
Merge
2010-03-30 10:17:14 -04:00
197c4d0ab4
Fix the credits in the right file.
2010-03-30 10:15:53 -04:00
c73dcb0799
Fixed bug EXT-6270 (No confirm teleport dialog appears, while teleporting from teleport history tab).
...
Added teleport confirmation dialog to the teleport history panel.
Reviewed by Mike: https://codereview.productengine.com/secondlife/r/135/
--HG--
branch : product-engine
2010-03-30 15:51:32 +03:00
4968d50ae6
merge
...
--HG--
branch : product-engine
2010-03-30 15:21:43 +03:00
8ba495722c
fix for normal EXT-5882 Max. Contribution field on groups -> land and assets tab miscalculates after first group fetch.
...
reviewed vsavchuk https://codereview.productengine.com/secondlife/r/133/
--HG--
branch : product-engine
2010-03-30 15:19:42 +03:00
337ddc1593
fixed EXT-6509 URL-name of object is shown as hyperlink in widget style Nearby chat
...
set allow_html to false for Message Header and Name field of Object Inspector
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/127/
--HG--
branch : product-engine
2010-03-30 12:49:05 +03:00
50802e68fc
Fixed normal bug EXT-5696 (chiclets bar minimal width doesn't match design specification)
...
* Increased the minimal width of Chiclet panel up to 95 px.
* Also set default width between chiclet panel & im well the same as minimal (4 px).
For now minimal viewer width when all buttons are still visible (and have non-truncated labels in the 'EN' locale)
with opened sidetray is 1042 px; with short Speak button (without text label) is 991 px.
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/126/
See also EXT-3397
--HG--
branch : product-engine
2010-03-30 12:14:37 +03:00
72cf448492
Fixed normal bug EXT-6390 (inventory loses focus after renaming a inventory item)
...
- Discard NULL'ing item after renaming it, to avoid focus losing of this item
Reviewed by Samuel Kolb at https://codereview.productengine.com/secondlife/r/128/
--HG--
branch : product-engine
2010-03-30 10:00:40 +03:00
e1517318c5
Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the 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-29 18:36:47 -07:00
59394005f1
Merge from viewer-2-0
2010-03-29 20:33:24 -04:00
9e211a3e20
Default MediaShowOnOthers setting to false.
...
--HG--
branch : EXT-4880
2010-03-29 17:00:44 -07:00
86dc5bce1a
Automated merge
2010-03-29 16:24:58 -07:00
eeeca91797
merge
2010-03-29 15:29:12 -07:00
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
ab6a2456c0
VWR-17649 en_xui_change
2010-03-29 13:16:12 -07:00
78436b3237
EXT-6572 (major bug) DE workaround to remove the word "Kaufen" and leave just the L$ link to avoid obvious linguistic error due to poor source design, at Simone's request
2010-03-29 12:51:01 -07:00
998c7fb94b
VWR-17644 undo old 'es' overrides
2010-03-29 12:45:29 -07:00
b1b5a11bb0
EXT-3075 : Remove swear words from comments across viewer
...
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
3fca923949
Fix initial outfit selection dialog to choose initial outfit based on
...
what's passed up from login.cgi instead of just using hardcoded
values. If nothing is passed up, it defaults to values in settings.xml
2010-03-29 11:58:31 -07:00
3ce8365062
automated merge
2010-03-29 14:46:14 -04:00
fbdd93bb91
EXT-6536 : Make LLVOAvatarSelf a singleton
...
No longer explicitly deleting gAgentAvatarp due to reference counting.
2010-03-29 14:45:21 -04:00
5de0c907de
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-29 12:33:22 -06:00
b4cb21e9b3
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Fix for cleaning up gAgentAvatar on app shutdown.
2010-03-29 13:55:43 -04:00
a339e02d91
automated merge
2010-03-29 13:51:27 -04:00
0ffc73855b
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Fix for cleaning up gAgentAvatar on app shutdown.
2010-03-29 13:50:37 -04:00
8b40230f41
fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == mHeaderEntriesInfo.mEntries)
2010-03-29 11:32:47 -06:00
970b7051ac
fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile [secondlife-bin lltexturecache.cpp:1292]
2010-03-29 11:28:42 -06:00
Loren Shih