Lirusaito
44b69f3d3e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h Chose Shyotl's.
2012-07-11 23:23:31 -04:00
Shyotl
4f3f503953
Recreate mDeferredVB on vertexbuffer reset.
...
Shuffled some code from LLVOPartGroup::restoreGL() to LLVOPartGroup::destroyGL(), as it makes more sense there.
Bind the correct shader in wireframe..
glLineStipple call managed to sneak into no-fixed-function mode.
LLViewerWindow::initFonts was called frequently and redundantly during destroygl->restoregl transition.
2012-07-11 17:12:40 -05:00
Lirusaito
26810ff16a
Fixed up Keywords
...
Up to date definitions and reorganizations,
commented out constants that apparently don't exist.
Fixed Strings not highlighting by borrowing missing code from Phoenix.
Also, this fixes 1020 being treated as UnknownAltitude when not on SL grid
and cleans up the horrible tabbing/spacing mud in llfloateravatarlist.cpp
2012-06-24 01:52:56 -04:00
Lirusaito
b02465822b
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-06-19 16:16:49 -04:00
Shyotl
e6b6e8b282
Unbork lltabcontainer's clipping. Also made vertical tab scrolling actually work (apparently it hasn't in quite some time).
2012-06-19 14:30:13 -05:00
Lirusaito
102565cd3e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/app_settings/settings.xml
2012-06-17 10:42:56 -04:00
Shyotl
dadfc059c7
Minor llxmlnode updated. Tracks line numbers and ostream format is a bit nicer.
2012-06-15 09:52:35 -05:00
Shyotl
4c45e9a9d1
Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.
2012-06-15 09:51:11 -05:00
Shyotl
fb1594535e
Intermediate step in refactoring appearance panel
2012-06-02 17:32:19 -05:00
Lirusaito
58c58dc845
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-23 03:46:48 -04:00
Shyotl
ae0804beea
Trival V3 llmath merge.
2012-05-21 20:23:42 -05:00
Lirusaito
e729bd80ce
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-17 02:09:20 -04:00
Shyotl
d1540040a8
Added extra callback registering methods to LLUICtrl
2012-05-16 23:22:57 -05:00
Lirusaito
e20b383aa0
Small changes that seem to make clang happier.
2012-04-30 23:48:30 -04:00
Lirusaito
8e6063e7b9
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00
Shyotl
35bd8d90be
Subpanels created through ui factorymap callbacks which also call LLUICtrlFactory::getInstance()->buildFloater in said callbacks (opposed to using the filename attrib due to that not supporting sub-factorymap callbacks) now get a position fixup determined by parents position attribs for that subpanel after being built.
2012-04-24 17:12:13 -05:00
Shyotl
e7649d8f1c
Avoid re-issuing LLPanel::postBuild() needlessly. Essential to avoid callbacks being double-registered to ui element signals (eg, LLOverlayBar::toggleMusicPlay was being called twice per click).
2012-04-24 03:11:10 -05:00
Shyotl
b49ad1cd34
RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
2012-04-12 10:29:45 -05:00
Siana Gearz
f05edda4f4
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloatermessagelog.cpp
indra/newview/llstartup.cpp
indra/newview/llviewermenu.cpp
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/menu_inventory.xml
2012-03-28 22:27:45 +02:00
Siana Gearz
196e9d6c78
Unbreaking Ctrl+W the right way
2012-03-25 09:31:06 +02:00
Shyotl
55e589375f
scroll-list column headers now work on single-click. Also improved focus handling for scroll-lists.
2012-03-05 18:30:36 -06:00
Shyotl
d54c86e1df
UI polish (scrollbar focus, tearoff menus), plus drag and drop fix.
2012-03-04 23:15:53 -06:00
Shyotl
2d75e8fda6
Added mouse_wheel_opaque attribute for scroll_list. Made several advanced submenus tear-off-able. Updated menu hover logic (removed MAX_MOUSE_SLOPE_SUB_MENU check) to make menus behave more predictably to cursor movement. Improved menu handling when it runs off of screen (and only uses vertical flip if menu item is in lower half of screen)
2012-03-03 22:11:53 -06:00
Shyotl
9f2b668424
Restore esc key behavior.
2012-03-03 04:31:06 -06:00
Shyotl
502b2d30d4
ScrollList crashfix (leftover ascent bug)
2012-03-03 04:30:15 -06:00
Shyotl
355883aa5c
Context menu appears for text-entry boxes. Temp workaround for shutdown crash. Removed extra 'Wear' entry from inventory context menu. Fixed separators not appearing in inventory context menu. mouse_opaque actually 'blocks' mouse events on occluded ui elements.
2012-03-02 23:30:57 -06:00
Shyotl
500135941a
Modernized lluictrl. Added LLViewModel. Fixed focus callbacks being called excessively. Updated LLButton, and implemented boost::signals2 to replace old callback handling.
2012-03-02 16:57:33 -06:00
Shyotl
2bf940e15d
Fixed up inventory filter. Basic folders now have an 'open' icon. Tweaked the indent size for inventory (looks a little nicer imo)
2012-02-27 02:53:12 -06:00
Shyotl
a066730acb
Added LLInitParam. Not yet plugged into xml parsing.
2012-02-24 20:16:33 -06:00
Shyotl
a6a69caa4f
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloateropenobject.cpp
indra/newview/llinventorybridge.cpp
indra/newview/llviewerinventory.cpp
2012-02-24 13:21:59 -06:00
Shyotl
c2da7f4570
Fixed translations failing attachment text. (support 'value' attribute for strings starting with a space)
2012-02-22 00:09:52 -06:00
Shyotl
bdeead6f8e
Updated LLView:
...
-Removed a few extra unneeded virtuals
-Pulled tabgroups out of llpanel and into LLView
-removeChild doesn't support delete. Delete manually.
-addChildAtEnd renamed to addChildInBack
-getScreenRect renamed to calcScreenRect
-added calcScreenBoundingRect and calcBoundingRect(which updateBoundingRect calls
-General cleanup. Someone at LL figured out that dynamic_cast actually exists.
Fixed PieMenu not reliably centering on cursor.
Fixed context menu crash in line and text editors.
Classes with LLEditMenuHandler as a base do not need to set gEditMenuHandler to NULL, since LLEditMenuHandler's dtor does that already!
2012-02-21 21:59:22 -06:00
Shyotl
e2e65c39bf
Fixed up LLMenuGL and variants a bit.
2012-02-19 17:41:54 -06:00
Shyotl
cf4b8cf263
Added LLView::translateIntoRectWithExclusion utility function.
2012-02-19 13:11:52 -06:00
Shyotl
b0240320ee
Inv menus appear now. Still need to update llmenugl and its variants, since our current version is buggy. Also need to look into why inventory postfixes aren't appearing.
2012-02-18 01:59:02 -06:00
Shyotl
1810a7c7f9
Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.
2012-02-18 01:58:02 -06:00
Aleric Inglewood
0a7fc0e65e
LLViewerRegion WIP: brought LLTrans up to speed with V3.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
b8744b9e6a
LLViewerRegion WIP: Added all headers that are dragged in.
...
Most in particular llevents.h, which comes along with
the demand that the old events in llevent.h are put
in a namespace LLOldEvents. Made all changes necessary
to compile the rest of the code again (without changing
the actual code: it's still using the old events).
This patch also removes LLStopWhenHandled and LLStandardSignal
from indra/llui/llnotifications.h because those are
moved to llevents.h. That seems to be the only change
to indra/llui/llnotifications.h that isn't floater related,
so I left the rest of that file alone.
2012-02-18 02:22:49 +01:00
Shyotl
a90d7bbb46
Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.
2012-02-16 12:00:38 -06:00
Siana Gearz
e1e34623cb
UI purdyness had its flaws - should revisit later
2012-02-06 20:12:02 +01:00
Shyotl
a0c549534f
Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory).
2012-01-29 17:10:04 -06:00
Siana Gearz
d385de9139
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llstartup.cpp
indra/newview/llviewerregion.cpp
2012-01-24 21:22:49 +01:00
Shyotl
6374f012de
new fasttimers, including ui.
2012-01-23 18:30:54 -06:00
Siana Gearz
b2dd4f652e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-13 19:14:43 +01:00
Siana Gearz
6bbff07e00
UI Purdyness
2012-01-13 19:14:14 +01:00
Shyotl
c371b82900
Added an optional val_width to slider and multi_slider_bar. When using this be sure it isn't truncating, as setting this value sets the textbox to a fixed width, with no consideration to the actual value it can contain.
2012-01-13 01:02:46 -06:00
Siana Gearz
d2b2c501bc
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-01-12 03:44:48 +01:00
Siana Gearz
465660e235
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-12 01:42:59 +01:00
Siana Gearz
4eea8624b7
Fix keyboard shortcuts like ctrl+w for floaters
2012-01-12 01:37:13 +01:00
Lirusaito
8543106f5e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-11 02:28:14 -05:00