Commit Graph

5372 Commits

Author SHA1 Message Date
Latif Khalifa
1ab5c6a32a Merge branch 'master' of git://github.com/LightDrake/SingularityViewer 2013-11-07 01:07:14 +01:00
Latif Khalifa
2234e95d5c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-11-07 01:06:53 +01:00
Inusaito Sayori
511b0cfb9c ContextMenu Support!
LLContextMenu functionality pulled out of LLPieMenu, PieMenu is now derived from LLContextMenu
- The more attribute boolean of pie_menu element determines whether or not to have an actual submenu if it's not a pie, defaults to false which means actual submenu..
-- in the future we may want to have more more="true" depending on feedback
- Pie menu labels now dynamically get " >" appended to them (avoids stupid looking context menus)
- Positioning logic combined in part, mostly conditional still, in the future we could probably combine it more.
- handleHoverOver function combines common functionality between context and pies given an item and hover mouse coords.

LiruUseContextMenus debug setting determines which to use, default is pie, of course
- Context(/Pie) Menus are rebuilt when the setting changes value
-- this is safe at any point because all startup states have been accounted for
- "Use context menus instead of pie menus" added to System->General preferences (it's close to the bottom)
2013-11-06 18:47:02 -05:00
Inusaito Sayori
f41c4dd273 Don't open disabled submenus! 2013-11-06 17:44:11 -05:00
Inusaito Sayori
cb0cc571ee Mats UI.
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter()
Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding)
Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors.
Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream.

Translators:
panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed.
strings.xml now has "use_texture" string.
notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
2013-11-06 17:39:04 -05:00
Inusaito Sayori
06186e6c7e [VarRegions] Pseudosupport for region_size_y. 2013-11-06 15:53:15 -05:00
Inusaito Sayori
659874dce0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-06 01:10:47 -05:00
Shyotl
322ceceb60 Added shaders needed to display texture 'edit' overlay using the specular/normalmap texcoords. 2013-11-05 23:51:09 -06:00
Latif Khalifa
d8db37f3fb Simplify tag decoding,
Disable showing other's tags by default as it appears broken in most viewers
2013-11-05 07:25:11 +01:00
Inusaito Sayori
5a2ec28ddf Refactor panel_tools_texture.xml file in preparation to merge (nothing changed yet)
Pulled out defaulted/dead attributes, switched to v3 markup stylings.  Merged in some norspec comments.
2013-11-04 23:00:15 -05:00
Inusaito Sayori
31e2fdc16e Allow v3 xui alternative naming of combo_item as combo_box.item 2013-11-04 22:56:36 -05:00
Inusaito Sayori
f935453859 Allow v3 xui style strings for anything panel derived. <panel.string/> 2013-11-04 22:54:44 -05:00
Latif Khalifa
7ffb751ead In preparation to release, change defalt for crash reporting to 'Ask' 2013-11-05 02:35:08 +01:00
Inusaito Sayori
7129d97ee5 panel_tools_texture.xml splits off from floater_tools.xml (No real changes here, but this change will make life so nice for me) 2013-11-04 17:49:29 -05:00
Inusaito Sayori
ec55c53b62 French menu gets Motion Resets Camera courtesy of Nomade (more translation on the way) 2013-11-04 17:10:42 -05:00
Drake Arconis
e1356b7aaf Fix slight breakage in the osx cmake 2013-11-03 23:00:56 -05:00
Latif Khalifa
0cbaa752a6 At the request of LL, append more info to channel string sent to the login server
Send versio number bare, without channel name, as V3 does
2013-11-04 04:04:39 +01:00
Inusaito Sayori
2f80012ccd Feature Request: If EditLinkedParts is on, Copy Key should copy keys of any selected prim(s) 2013-11-03 20:51:48 -05:00
Drake Arconis
1553a90ebb Merged master 2013-11-03 20:15:41 -05:00
Latif Khalifa
7fe411cd85 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-11-03 21:48:21 +01:00
Inusaito Sayori
083aaffec7 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-11-03 15:28:01 -05:00
Latif Khalifa
232b1cf28c Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-03 04:56:31 +01:00
Shyotl
6bbb24b974 Revert occlusion changes to try and pinpoint flicker issue. 2013-11-02 22:43:11 -05:00
Shyotl
827bbc9b89 Fix up a few glowies. 2013-11-02 19:15:28 -05:00
Latif Khalifa
822b728adb Only build Quicktime on 32 bit Windows
Helps address issue 1180
2013-11-03 00:32:01 +01:00
Latif Khalifa
8ed527af24 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-02 12:46:16 +01:00
Shyotl
77eb928380 Add LLGLManager::mIsMobileGF 2013-11-02 03:33:21 -05:00
Shyotl
378dd14ade Return to our nice ssao. 2013-11-02 03:29:32 -05:00
Shyotl
e5d71560e8 Fix fullbright stuff in deferred. Have to re-assess old glow occlusion bugfixes. 2013-11-02 02:38:23 -05:00
Latif Khalifa
824f23082b Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-02 07:25:36 +01:00
Shyotl
af8f8bb040 Mats. 2013-11-02 01:20:05 -05:00
Inusaito Sayori
23e9eabedb These new icons need tooltips 2013-11-01 17:57:52 -04:00
Latif Khalifa
b9c487a0c7 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-11-01 22:50:22 +01:00
Inusaito Sayori
96e8f37c81 The rest of some touchups to wlf xml for nicer alignment of elements 2013-11-01 17:43:32 -04:00
Inusaito Sayori
0fc9d540bf Feature Request: Add Camera preset switching functionality (part of quicksettings)
Hitting Escape will reset to the normal Back preset
Adds new Cam_Preset_*_(On|Off).png textures, these should probably be reskinned, any volunteers?
2013-11-01 17:35:12 -04:00
Latif Khalifa
1f587d1ad1 Don't crash when trying to export linked parts
Fixes issue #1176
2013-11-01 22:34:55 +01:00
Inusaito Sayori
2d421a27e1 Let Ctrl/Shift + scrollwheel changing the camera/focus offsets affect the current preset's setting, not the back preset. 2013-11-01 16:56:55 -04:00
Inusaito Sayori
3934e0c9d3 Fix Issue 1163: Mouselook zoom (silly control group confusion) 2013-11-01 11:18:12 -04:00
Inusaito Sayori
ba1a29aae2 French Translation updates! Provided by Nomade Zhao 2013-11-01 02:56:21 -04:00
Latif Khalifa
3d47d6f0dc Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-10-31 16:39:08 +01:00
Latif Khalifa
5583445c4d Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-31 16:38:40 +01:00
Latif Khalifa
78843493cc Syntax error fix 2013-10-31 03:31:12 +01:00
Latif Khalifa
fcfffbb322 breakpad filter signature is different on windows compated to other platforms 2013-10-31 02:51:58 +01:00
Aleric Inglewood
e4b35a050d This makes more sense 2013-10-31 02:38:23 +01:00
Aleric Inglewood
8506a16dcb Merge remote-tracking branch 'singu/master' 2013-10-31 02:19:37 +01:00
Latif Khalifa
8dab5df746 Revert "Prevent LLFace::getGeometryVolume from overwriting vbos past their end."
This reverts commit 02067f973e.
2013-10-31 02:10:57 +01:00
Aleric Inglewood
811191cc7c Merge remote-tracking branch 'singu/master' 2013-10-30 21:57:39 +01:00
Aleric Inglewood
a9972bbf02 Suppress spammy warning (debug mode) 2013-10-30 20:32:22 +01:00
Latif Khalifa
51d5984afa Allocate half a megabyte that is freed just before minidump is written in the breakpad exception handler (Siana) 2013-10-30 19:10:17 +01:00
Latif Khalifa
f1eab3f2c5 Added architecture fields to the crash report 2013-10-30 19:09:05 +01:00