Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,984 Commits 20 Branches 51 Tags
f6bd78083d6510e01c174e691153679a76334791
Commit Graph

1984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleric Inglewood
f6bd78083d More merge fixes 2012-01-22 02:49:06 +01:00
Aleric Inglewood
f176aeed8d More 64-bit related compile errors. 2012-01-22 02:48:28 +01:00
Aleric Inglewood
94d6ef126f Fix compiler error on 64-bit: error: cast from ‘char*’ to ‘U32 {aka unsigned int}’ loses precision 2012-01-22 01:56:35 +01:00
Aleric Inglewood
14f2df2a72 Remove compiler warning 'cast from pointer to integer of different size'. 2012-01-22 01:50:25 +01:00
Aleric Inglewood
82693aae35 linden_common.h must be included first for libcwd 2012-01-22 01:38:33 +01:00
Aleric Inglewood
c4e55464c9 Resolved collisions of merge with siana/master 2012-01-22 01:32:52 +01:00
Siana Gearz
a39bf61977 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-01-14 13:54:24 +01:00
Siana Gearz
6a290864af Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-14 07:38:31 +01:00
Siana Gearz
20ab55752d Remove megaregion support 2012-01-14 06:46:16 +01:00
Lirusaito
4190816023 Removed the first configure command description and aligned the first two commands with the last two so it looks prettier. 2012-01-13 23:55:49 -05:00
Lirusaito
e33a15d410 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-13 23:46:32 -05:00
Siana Gearz
419f7b41af Global lineending fixup 2012-01-14 05:42:53 +01:00
Shyotl
670b85a86f Migrated code out of drag and drop, and into LLGiveInventory. 2012-01-13 22:41:15 -06:00
Siana Gearz
e835d51bdf Revert "Crude port of megaregion mem corruption fix, by Rev" 
This reverts commit 6b60fe40c6.
 2012-01-14 05:33:05 +01:00
Siana Gearz
242134d2af Line ending unbotch 2012-01-14 05:32:22 +01:00
Shyotl
f0f2834cfe More stuff migrated to llinventoryfunctions.cpp 2012-01-13 21:05:53 -06:00
Shyotl
860bddb1f5 Added LLViewerInventoryType. Migrated some code to llinventoryfunctions.cpp. Pulled LLFolderViewEventListener out into itse own header. Misc tweaks to LLInventoryBridge and LLFolderBridge 2012-01-13 18:11:03 -06:00
Lirusaito
14f9cd57e1 Moved the button up one pixel, aligning it with voice and sound expand buttons, lowered Water preset text a bit, and lowered the water bar one pixel perfectly centering it with the button. 2012-01-13 17:43:15 -05:00
Lirusaito
063112bf59 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-13 15:59:52 -05:00
Siana Gearz
e764329701 Fixed up a merge botch 2012-01-13 21:59:00 +01:00
Lirusaito
27a17b332f Spelling fix 2012-01-13 15:51:58 -05:00
Lirusaito
373688cfb0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-13 15:50:16 -05:00
Siana Gearz
09d37d7dfd Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 
Conflicts:
	indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
 2012-01-13 19:18:22 +01: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
Lirusaito
09c7e66844 Spelling fix: 
Query only has on r.
 2012-01-13 03:23:20 -05: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
Lirusaito
5da990e8fb Eep, did I leave that part of the test in?! 2012-01-13 00:52:13 -05:00
Lirusaito
b96beb478c Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-13 00:32:03 -05:00
Shyotl
ad3a16fd3b Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2012-01-12 23:30:17 -06:00
Shyotl
21b6b89577 If this assert hits then I want your callstack, and so does Bao Linden. SH-2827 2012-01-12 23:28:38 -06:00
Shyotl
55a66737c0 Disable a certain octree error that likes to fire a bit frequently. 2012-01-12 23:24:44 -06:00
Lirusaito
198e499798 Fix for error: incomplete type ‘LLInventoryObserver’ used in nested name specifier presented by GCC 4.6.2 2012-01-13 00:18:37 -05:00
Lirusaito
9d3b276f61 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-12 23:39:16 -05:00
Lirusaito
b0967463ca Take a good look at the Settings Panel in the release, see how icky it looks? Well, Boom! 2012-01-12 23:35:58 -05:00
Shyotl
1cc33caaa3 Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions 2012-01-12 18:57:10 -06:00
Lirusaito
0777bedde8 Made it so the quick setting changer button never leaves its exact spot pixel for pixel; 
Moved where exactly the bottom of the expanded panel was to match the unexpanded bottom;
Extended the bars of WindLight because their lack of capitalization on available real estate has been bugging me;
Changed the tooltip of the WindLight Water control to no longer _reflect the Sky_.
 2012-01-12 17:48:43 -05:00
Lirusaito
be978ab76b A small change issued by Siana to correct a small problem. 2012-01-12 17:35:41 -05:00
Lirusaito
21a64b306d Added in two options under Help->Bug Reporting for reporting bugs with Singularity more easily: 
Report Singularity Bug goes to the new issue page.
Singularity Issue Tracker goes to the issues list.
Spelling correction.
WebLaunchSinguIssue is called in these two new menu options.
 2012-01-12 13:40:14 -05:00
Lirusaito
5a66c2bfba Added WebLaunchSinguIssue Notification, which will make sense in the next commit. 
Also corrected location of Report Bug from in Tools to in Help under Bug Reporting.
 2012-01-12 13:32:44 -05:00
Lirusaito
e5a27e6558 Added WebLaunchSinguIssue notification, but if feel my translation skills inadequate, so I'm just throwing this out here for someone like Nomade Zhao to correct and finish. 2012-01-12 13:25:20 -05:00
Lirusaito
6f3a92d772 Fixed spelling. 2012-01-12 13:10:27 -05:00
Siana Gearz
4feb69e342 Crouch toggle rewrite - removed garbage. 2012-01-12 06:35:42 +01: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
09213950c3 May or may not fix a lack of AO stand animations caused by my last commit... probably does 2012-01-11 11:30:18 -05:00
Lirusaito
d93f0bb56a Rubber-band camera in crouchtoggle avoided. 2012-01-11 11:18:23 -05:00
Lirusaito
4de23007a5 Added crouch toggle, global bool called isCrouch, function agent_toggle_down bound to toggle_down. 
Shift+crouch=toggle, crouch doesn't work while toggle crouched, at the moment.
Formatted keys.ini to be completely aligned.
 2012-01-11 11:04:12 -05:00
Lirusaito
8543106f5e Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-11 02:28:14 -05:00