Commit Graph

131 Commits

Author SHA1 Message Date
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
Shyotl
9476aedaf6 Respect passed alpha value for checkerboard. 2012-01-11 00:50:39 -06:00
Shyotl
68bc6749e5 Hooked LLTrans into LLNotification stuffs. Also, fixed [CURRENCY] showing up in several places on the buy land window. 2012-01-11 00:49:14 -06:00
Lirusaito
c5d4ccc78d Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-09 17:59:17 -05:00
Shyotl
e847b105f2 CURRENCY added as a default token replacement within LLTrans. (Will be useful when strings are migrated from ui xmls to strings.xml). Also, fixed compile (missed llwindowcallbacks.cpp in my previous commit) 2012-01-09 16:54:13 -06:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
Lirusaito
5dd2f5e2cf Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-09 05:10:15 -05:00
Shyotl
e9bd6a3b0d Better translation support relating to client initialization/login. 2012-01-09 01:40:30 -06:00
Lirusaito
621e677898 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-07 17:09:43 -05:00
Lirusaito
626a94cf8f Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-07 15:38:58 -05:00
Siana Gearz
d66074d2ea Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-07 21:36:24 +01:00
Lirusaito
900d063d4f Just fixed this file up a bit to look a bit nicer... Won't affect performance. 2012-01-06 11:18:31 -05:00
Siana Gearz
b911e86b02 Merge branch 'future' of git://github.com/Shyotl/SingularityViewer 2012-01-06 10:40:05 +01:00
Shyotl
54bfdb7704 Stippling removed. Emulated with a texture and some texcoord manipluation. (looks identical, and works with and without shaders) 2012-01-06 00:53:18 -06:00
Shyotl
ca96e00135 Enable gl sync fence. Missed a vertexbuffer flush. moved LLMultiFloater out of llfloater.(h|cpp) and into its own header and source file, matching v2. 2011-12-26 23:40:18 -06:00
Siana Gearz
fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
Shyotl
78f7cc0d64 Prim rotate tool was lacking colors on its 'rings' due to missing gGL.diffuseColor4fv calls. 2011-12-16 06:01:05 -06:00
Shyotl
ffb285c6ff Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00