061c3a5ab6
VWR-20879: Allow find_vc_dir() to work with VCExpress
2010-12-27 12:18:19 +00:00
43659aac93
STORM-485 Reduced width of 'Cancel' button in Group Invitation floater
2010-12-26 16:03:23 -05:00
5e9e350deb
STORM-737 Added comment. Combined code to eliminate temporary constant.
2010-12-24 18:09:08 -05:00
5d4b4a1859
STORM-737 Removed unnecessary blank link from llpanelmaininventory.cpp
2010-12-24 15:28:46 -05:00
0c5bd3675b
STORM-744 : Took code review into account, moving stuff back in protected or even private, fix things to work in debug mode, some clean up in j2coj also
2010-12-24 11:36:15 -08:00
f644ef0fb0
STORM-682 FIXED Fixed positioning notification toasts in mouse-look mode.
...
Toasts were positioned as if side tray was expanded.
The fix is to reshape the so-called toasts screen channel (an area where toasts are drawn)
on entering/leaving mouse-look mode, so that the screen channel can notice that side tray get in/visible.
2010-12-24 20:20:26 +02:00
265616ca02
STORM-682 WIP Removed unused code.
2010-12-24 18:53:45 +02:00
a9caa3151c
merge fix for storm-411
2010-12-24 09:08:20 -05:00
ef1c3aac88
merge fix for storm-784
2010-12-24 09:07:06 -05:00
14d830ca43
merge improved fix for STORM_785
2010-12-24 07:41:41 -05:00
5a4bb72b8d
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
2010-12-23 19:41:44 -05:00
1ca028cd7b
STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects
2010-12-23 17:12:37 -05:00
971eb7f198
STORM-737 Inventory/Recent: Gray out "New Folder" in "+" menu and enable all menu items except "New Folder" when right clicking an item.
2010-12-23 15:56:15 -05:00
c02d6a319f
STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference instead of per-machine.
...
- Made changes in code of floater preferences and panel login that were required because of turning the setting per-account.
- Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
2010-12-23 18:15:54 +02:00
7105d98e24
STORM-438 FIXED My inventory floater is not restored if it was minimized and 'Open Attachment' button was pressed in the Group Profile.
...
- Added check whether floater is minimized
2010-12-23 14:52:57 +02:00
49de8add83
STORM-810 : Auto update and related changes (integration request from team chopper)
2010-12-22 23:24:58 -08:00
e874b156c5
STORM-744 : pull from STORM-151
2010-12-22 22:32:14 -08:00
f8325ac588
STORM-805 : add some printout to the log so we can trace the answer map-server-url at startup
2010-12-22 22:09:42 -08:00
fa776d8054
Merge with tip of viewer-development
2010-12-22 15:22:43 -08:00
c86d6a7bbb
STORM-808 : merge webkit upgrade to Qt v4.7.1
2010-12-22 14:06:46 -08:00
0eb491417e
STORM-806 FIXED Enabled external editor for inventory scripts.
...
Changes:
* Moved external editor handling to LLScriptEdCore which is shared between
LLLiveLSLEditor (object script editor) and LLPreviewLSL (inventory script editor).
* The Edit button is now only enabled when appropriate.
2010-12-22 21:48:42 +02:00
9b0e4d20a9
Setting viewer version numbers back to what they were as per Merov's review request.
2010-12-22 10:47:18 -08:00
bf20d1498b
merge
2010-12-22 10:28:16 -08:00
375bdb6d1e
removing some very old debug spam
2010-12-22 10:06:36 -08:00
740bd8dbfd
merge
2010-12-22 09:54:45 -08:00
7365ee2d9d
merge
2010-12-22 09:36:12 -08:00
ef5f9ee893
STORM-466 Fix for: minimap cannot be reset to default zoom
2010-12-22 08:47:43 -05:00
6182ded4e9
SOCIAL-374 FIX (Windows) Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Updated llqtwebkit build for Windows from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21 17:11:01 -08:00
ec3a58d2e3
SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Updated llqtwebkit build for Mac from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21 16:46:30 -08:00
5d6ccc5cde
SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7
...
Reviewed by Callum
2010-12-21 16:38:06 -08:00
ab100825bd
STORM-151 : pull in viewer-development
2010-12-21 15:40:42 -08:00
704873e0da
STORM-460 : pull in viewer-development
2010-12-21 15:32:03 -08:00
a2d7d12246
STORM-524 : pull in viewer-development
2010-12-21 15:30:25 -08:00
472c9363a4
STORM-453 : pull in viewer-development
2010-12-21 15:27:41 -08:00
e1b198a36b
Merge from trunk
2010-12-21 10:33:58 -08:00
a8edb1af21
STORM-151 : Fix llui_libtest integration test
2010-12-20 23:09:16 -08:00
d275251138
SOCIAL-399 FIX Viewer crash when canceling http auth on a media prim
...
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20 16:33:25 -08:00
36207fcf1a
STORM-805 : Fix the map URL
2010-12-20 12:59:17 -08:00
67a914ebd7
Fix for a couple of minor merge issues.
2010-12-20 12:02:56 -08:00
fdd5348f81
Remove unimplemented software updater option. Fix potential double start of updater service.
2010-12-20 11:34:06 -08:00
dee57bea25
Merge from viewer-development.
2010-12-20 11:21:17 -08:00
2c68cb2c69
fix windows build?
2010-12-20 10:38:36 -08:00
9c97a200be
Merge - final pull of viewer-development.
2010-12-20 09:57:39 -08:00
049b00a6f1
Fixing windows build error about inequality comparison between S32 and U32.
2010-12-20 09:03:59 -08:00
bdd07a7a64
STORM-411 FIXED The most of additional options in the Teleport History profile are always disabled
...
- Deleted unimplemented menu items from XML
- Hide "Make a Landmark" menu item in case "Teleport History Place Profile" panel is opened
2010-12-20 18:04:59 +02:00
25eef545fd
merge fix for storm-412
2010-12-20 09:06:06 -05:00
81b5931146
merge fix for storm-801
2010-12-20 09:05:09 -05:00
46422ab953
merge fix for storm-796
2010-12-20 09:04:09 -05:00
09c7d38166
STORM-467 Fix for minimap zoom does not persist to the next session
2010-12-18 16:44:51 -05:00
1718ca48c2
STORM-511 FIXED Display tooltip for sender name on group notices.
...
Changes:
* Set tooltip for sender name.
* Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18 20:17:36 +02:00
Robin Cornelius