Commit Graph

2016 Commits

Author SHA1 Message Date
Lirusaito
da96043a24 Chopped off a ton of the old stuff, and added value fields... These don't seem to work right, however, no matter, the value fields help make more precise changes.
The existence of these were brought up to me by a phoenix user, not sure why showing them was set false.
2012-01-26 05:43:09 -05:00
Lirusaito
43b826bd52 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-26 00:03:53 -05:00
Siana Gearz
3261332e0b ouch-i-feel-so-stupid build fix 2012-01-26 02:30:42 +01:00
Siana Gearz
6939d2d70b Build fixes 2012-01-25 23:45:18 +01:00
Siana Gearz
df65a3b7fc Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-01-25 22:20:31 +01:00
Siana Gearz
7d9299d870 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-01-25 22:18:21 +01:00
Lirusaito
00ae7c3cd3 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-25 15:52:32 -05:00
Lirusaito
769c4f43bd More cleaning up, some rephrasal of old stuff, changed some words to better suitsuit Singularity.
*yawn*
2012-01-25 15:45:23 -05:00
Siana Gearz
7fec659979 Update RLVa to 1.4.0-compatible 2012-01-25 21:11:33 +01:00
Lirusaito
d104d15c53 Yay, more cleaning! 2012-01-25 12:54:43 -05:00
Lirusaito
22137671da Stuff looks nicer than before, and removed a few more large archaic tag attributes. Also restored missing names, names for translating... wish they weren't so large... 2012-01-25 03:33:02 -05:00
Lirusaito
9577607c22 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-01-24 21:15:32 -05:00
Lirusaito
4340cee991 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-01-24 21:15:15 -05: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
c4e0122846 Call display_startup() periodically during initilization to avoid buggy drivers/windows from issuing vpu recover erroneously. 2012-01-23 20:36:25 -06:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Shyotl
7d4c2aa54f LLInventoryFilter migrated into llinventoryfilter.cpp/h 2012-01-22 21:46:10 -06:00
Shyotl
c5024ff04d Stab in the dark at fixing color corruption on 64bit builds. 2012-01-22 21:45:10 -06:00
Aleric Inglewood
63117686b1 Typo fix in comment. 2012-01-22 03:12:24 +01:00
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
Shyotl
51746dc751 Added wearable index handling to LLAgentWearables to scope out further changes. Index is still always zero for now, so behavior should not have changed. (marked with // TODO: MULTI-WEARABLE) 2012-01-21 19:02:19 -06: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
Shyotl
4a4b786a60 New inventory observer implementation. 2012-01-21 04:54:39 -06:00
Shyotl
d7d65df9e0 HTTP inventory fetching enabled. 2012-01-21 02:37:22 -06:00
Shyotl
40400d696b Updated inv fetching impl. Haven't ticked on new caps. 2012-01-21 00:11:19 -06:00
Shyotl
4c201a9b83 Inv fetch migrated from LLInventoryModel to LLInventoryModelBackgroundFetch singleton. 2012-01-20 19:09:44 -06:00
Shyotl
b338506229 VBO updates from Vir Lindens shining fixes. VBO mapping perf improvement. Alpha rigged attachments render fix, hopefully. Crashfix in void pushWireframe. 2012-01-19 19:01:44 -06:00
Shyotl
7805508e8d SH-2827 crashfix. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/806c10f621af 2012-01-19 10:36:56 -06:00
Shyotl
9837b0ea2e A little bit of code shuffling and member renaming in llinventoryview.cpp to line up with v3 a bit better. TO-DO: Many functions in LLInventoryView need to be migrated to something akin to v3s LLPanelMainInventory class. 2012-01-18 23:23:29 -06:00
Shyotl
60d5bb81f2 Tweak to CannotCopyWarning notification. Updated french notifications.xml a tiny bit. 2012-01-18 17:51:09 -06:00
Lirusaito
76cb68600c Rewrite of ancient xml preferences(The rest of the preferences still need this) so it takes up way less space and actually makes more sense...
last commit for a while do to illness.
2012-01-17 05:24:36 -05:00
Lirusaito
a6b270b02d Merge branch 'master' of git://github.com/lkalif/SingularityViewer 2012-01-16 23:14:13 -05:00
Lirusaito
f68a899185 Moved show avatar in Mouselook to Mouselook options... cause that's where it kinda should be... 2012-01-14 11:06:44 -05:00
Latif Khalifa
3299d27197 Added string needed to avoid modal error dialog with marketplace delivery 2012-01-14 16:16: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