Oz Linden
f452138f29
merge changes for storm-1427
2011-08-11 16:31:19 -04:00
Oz Linden
3e47d9aea9
merge changes for storm-632
2011-08-11 16:30:55 -04:00
Oz Linden
4c0565f381
merge changes for STORM-1534
2011-08-11 16:30:15 -04:00
prep linden
6b70273603
Added support for parsing of collada 1.4.1 location sids
2011-08-11 13:19:58 -04:00
Richard Linden
b215c724c1
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-11 10:11:59 -07:00
Richard Linden
9a9e78740a
Automated merge with file:///e:\code\viewer-experience
2011-08-11 10:09:28 -07:00
Oz Linden
0294a7c0e5
update default value for Lindens list
2011-08-11 09:33:38 -04:00
Richard Nelson
8b09dfb890
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-08-10 23:44:58 -07:00
Richard Nelson
2c15d7d690
EXP-1028 FIX Move mode switching to logged in UI
...
forgot a file
2011-08-10 23:44:26 -07:00
Richard Linden
ef3e18af52
EXP-1078 FIX Mode selector position does not move with other UI elements and can overlap UI or not be shown on screen when resizing window
2011-08-10 23:26:26 -07:00
Brad Payne (Vir Linden)
0d91c49571
Fix for merge breakages
2011-08-10 18:15:07 -04:00
Richard Nelson
d1fefdefd3
merge
2011-08-10 14:59:26 -07:00
Brad Payne (Vir Linden)
6732f5fbca
merge viewer-development to mesh-development
2011-08-10 17:53:11 -04:00
Richard Nelson
d93fb23fa1
EXP-1028 FIX Move mode switching to logged in UI
...
changed down arrows to up arrows for mode changers on login screen
2011-08-10 14:19:58 -07:00
Richard Nelson
e630e98253
EXP-1028 FIX Move mode switching to logged in UI
...
added mode switching button to status bars for advanced and basic mode, changed
login combo box to use menu instead
2011-08-10 14:15:15 -07:00
Oz Linden
2ba175befd
convert linden names list to string
2011-08-10 15:50:04 -04:00
Aaron Stone
dfcd11e51e
CHOP-757 Ask for the inventory-basic login option and dump its return id to llinfo.
2011-08-10 11:55:05 -07:00
Richard Nelson
e1532afb12
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-08-10 10:53:59 -07:00
Richard Nelson
11005a9d91
added fast timers to profile inventory LLSD deserialization
2011-08-10 10:52:56 -07:00
prep linden
20c3d84854
Submitted correction for logic error: if decomp fails for single hull only execute fallback code
2011-08-10 12:50:12 -04:00
prep linden
b2da13f46b
Joint resolver now constructed from key name (cts-660)
2011-08-10 12:27:29 -04:00
Seth ProductEngine
c70a357a27
SH-2076 FIXED Removed the sculpt type 'None' from edit dialog.
...
If a prim's sculpt type was set to 'None' it is displayed as 'Plane' in the combo box.
2011-08-10 18:59:10 +03:00
Seth ProductEngine
350894fc0b
SH-2064 FIXED 'Upload' button disabled while mesh upload is in progress.
2011-08-11 02:00:56 +03:00
Oz Linden
1bf7869b0b
storm-1060: yet another attempt to fix windows icons
2011-08-10 09:15:29 -04:00
Oz Linden
8d9394a409
storm-1549
2011-08-09 20:49:37 -04:00
eli
0e2b9f2144
sync with viewer-development
2011-08-09 16:16:39 -07:00
Richard Linden
802a063a87
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-08-09 16:14:55 -07:00
Richard Linden
70a872c4a2
EXP-700 WIP SLPlugin(s) takes high CPU%
...
clamp maximum framerate of slplugin to 100Hz
also added assert to catch cases where we're requesting infinite framerate
2011-08-09 16:00:56 -07:00
prep linden
0405e91df3
Reports error of a non compatible dae to the log if not 1.4
2011-08-09 17:10:17 -04:00
Richard Linden
008d95535f
EXP-880 FIX Disable address bar copy menu and open in external browser button
...
when using trusted browser or explicitly disabling address bar
2011-08-09 13:32:46 -07:00
prep linden
e384ccb5da
Temporarily disallow the upload of non 1.4 dae files
2011-08-09 16:31:36 -04:00
Vadim ProductEngine
6a7bbe0159
STORM-1546 FIXED Fixed a crash caused by a race condition in LLRefCount.
...
Reason:
secapiSSLCertVerifyCallback() seems to be called simultaneously by multiple threads,
which causes a race condition in LLRefCount::ref/unref() methods.
The reference counter in LLSecAPIBasicHandler::mStore goes to zero, and the object gets destroyed.
Fix:
Derive LLCertificateStore from LLThreadSafeRefCount instead of LLRefCount,
which should fix the race condition.
Note:
The LLThreadSafeRefCount constructor is private, so we have to wrap instances of the class with LLPointer.
2011-08-09 22:47:19 +03:00
Oz Linden
c7b6a25728
merge late beta fixes for storm-1060
2011-08-09 13:47:19 -04:00
Oz Linden
608403a846
merge changes for vwr-26458
2011-08-09 10:22:04 -04:00
Oz Linden
fc0166380b
merge changes for storm-1473
2011-08-09 10:21:07 -04:00
Oz Linden
4ff281ab94
merge changes for storm-1436
2011-08-09 10:20:41 -04:00
Oz Linden
f8c6283f4c
merge changes for storm-1309
2011-08-09 10:20:20 -04:00
Oz Linden
554159416f
merge changes for storm-1540
2011-08-09 10:19:45 -04:00
Oz Linden
4405c74f71
merge changes for storm-1194
2011-08-09 10:19:21 -04:00
Oz Linden
53efce5b5a
merge changes for storm-1186
2011-08-09 10:18:43 -04:00
Oz Linden
f8a2b67649
merge changes for storm-1060
2011-08-08 23:23:58 -04:00
Oz Linden
881a215535
more idiosyncracies for beta channel
2011-08-08 23:23:34 -04:00
Leslie Linden
1d67584171
merge
2011-08-08 15:17:48 -07:00
Leslie Linden
b6685b5872
EXP-1065 FIX -- Inventory has slowed to a crawl. Clicking between items has an average one second delay. Same with switching between tabs.
...
* Removed numerous places in the code that called findChild across the inventory panel unnecessarily.
* Conglomerated uses of inbox and outbox inventory panels to the sidepanel class so the pointers can be cached and functionality like selection handling can be done more efficiently.
* Optimized LLView::childHasKeyboardFocus() to work backwards up from the focus object rather than searching for children that may or may not turn out to have focus.
Reviewed by Richard.
2011-08-08 15:13:53 -07:00
Richard Nelson
f5886bfaff
EXP-1065 FIX Inventory has slowed to a crawl. Clicking between items has an average one second delay. Same with switching between tabs.
...
disable traversal of inventory contents for findView family of functions
2011-08-08 14:37:36 -07:00
Oz Linden
1d0575bcc4
merge beta fix for storm-1060
2011-08-08 16:52:08 -04:00
Vadim ProductEngine
ad0fcbc45c
merge
2011-08-08 23:49:14 +03:00
Oz Linden
f7e5282bad
fix idiosyncratic name for beta viewer channel icon recognition
2011-08-08 16:49:06 -04:00
Vadim ProductEngine
f695f8d112
STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web links in the ShareItemsConfirmation notification.
...
Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-08 23:46:23 +03:00
Oz Linden
4ab5831b3e
increment viewer version to 3.0.1
2011-08-08 11:13:15 -04:00