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

3836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drake Arconis
b76cb36c0f Merge remote-tracking branch 'Lirusaito/meshupload' into meshupload 2013-01-07 18:31:02 -05:00
Lirusaito
0636f0049a Rectify the problem in which profile images would be below the window border when first opened. 2013-01-07 18:20:02 -05:00
Drake Arconis
8346ce4cd8 Merge remote-tracking branch 'Aleric/meshupload' into meshupload 2013-01-07 18:10:38 -05:00
Drake Arconis
e565341e90 Merge branch 'master' into meshupload 2013-01-07 18:09:56 -05:00
Lirusaito
1b2c0ba02b v-d llviewermenufile.cpp functions (and order) for meshupload, decide when Upload Mesh entry should be enabled. 2013-01-07 18:08:42 -05:00
Aleric Inglewood
cbbe678f9e Remove FloaterModelPreviewRect 2013-01-07 23:31:40 +01:00
Aleric Inglewood
5efcc7186e Fixed mesh file picker and then some 2013-01-07 23:12:09 +01:00
Aleric Inglewood
d188ecae70 Fix crash because of missing debug setting 2013-01-07 23:01:10 +01:00
Shyotl
d71210e942 Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory) 2013-01-07 14:44:54 -06:00
Aleric Inglewood
9c20139ae8 Fix memory leak. This auto deletes the file picker, the old code did't. 2013-01-07 20:21:45 +01:00
Aleric Inglewood
da19e770a2 Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT 2013-01-07 20:11:18 +01:00
Aleric Inglewood
5e7acb9f3a Add support for ".dae" (and others) to filepicker load filter. 
* Brought llfilepicker.{cpp,h} up to speed with V3 by adding
  FFLOAD_MODEL, FFLOAD_COLLADA, FFLOAD_SCRIPT, FFLOAD_DICTIONARY
  However, note that we used FFLOAD_LSL, so I renamed their
  FFLOAD_SCRIPT to FFLOAD_LSL and kept our way of filtering.
* Fixed the filter token that is sent to the plugin for
  collada (from "dae" to "collada").
 2013-01-07 20:00:54 +01:00
Drake Arconis
6d379448be Fixed a build issue in clang 2013-01-07 11:59:25 -05:00
Aleric Inglewood
79763aacf7 Merge branch 'master' into meshupload 2013-01-07 17:59:21 +01:00
Aleric Inglewood
4b592f7507 Merge remote-tracking branch 'singu/master' 2013-01-07 17:58:53 +01:00
Aleric Inglewood
e7ef9eff4f Merge branch 'master' into meshupload 2013-01-07 17:50:03 +01:00
Drake Arconis
9e2049c463 Added darwin and windows libraries and added copying of collada and glod 2013-01-06 21:58:26 -05:00
Drake Arconis
8aa7113480 Merge branch 'master' into meshupload 2013-01-06 21:46:34 -05:00
Drake Arconis
b1b9172f28 Merge branch 'meshupload' of https://bitbucket.org/LightDrake/singularityviewer-test into meshupload 2013-01-06 21:21:02 -05:00
Drake Arconis
3a691e0c23 Fixed linking 2013-01-06 21:20:41 -05:00
Aleric Inglewood
a9a308e5e9 Never freeze again. 
Put snapshot related floaters always on top of the full screen preview.
Make having multiple running uploads more robust.
Fix infinite recursion when clicking on the bottom 'Snapshot' button
under certain conditions.
Unfreeze time more robust; unfreeze time out of precaution when
starting an upload (if 'Keep open' not checked).
Fixed a bug that caused all callbacks for successful feed uploads to be
ignored.
 2013-01-06 23:40:53 +01:00
Lirusaito
e7f4fc7107 Added colors for mesh upload MeshImportTableNormalColor and MeshImportTableHighlightColor to default/colors_base.xml 2013-01-06 12:46:56 -05:00
Lirusaito
ac60260da2 Update LLFloaterModelPreview and make it compile~ 
Collada include_directories and llfloatermodelpreview.*s added to CMakeLists.txt
Update to v-d, compile with AIFilePicker, comment spelling fixes.
Upload Mesh... entry added to File menu.
Updated AIFilePicker to have FFLOAD_COLLADA with an mFilter of "dae"
And, finally, add floater_model_preview.xml~
 2013-01-06 11:56:33 -05:00
Drake Arconis
364cf1ec73 Bug fix from v3 2013-01-06 09:47:02 -05:00
Drake Arconis
297c386b16 Fixed glod 2013-01-06 07:30:42 -05:00
Drake Arconis
152a3685fa Merge branch 'master' into meshupload 2013-01-06 04:03:49 -05:00
Drake Arconis
bb7464a975 Merge branch 'master' of https://bitbucket.org/LightDrake/singularityviewer-test 2013-01-06 04:03:14 -05:00
Drake Arconis
9c1237ca05 Initial work. 2013-01-06 03:59:38 -05:00
Shyotl
69e0738096 Fix crash when using edit appearance. SunshineRefactor 2013-01-05 22:05:53 -06:00
Siana Gearz
cd27184332 Take out buggy padding removal in OJ 2013-01-06 04:01:28 +01:00
Drake Arconis
cadf654fae Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-01-05 20:50:49 -05:00
Siana Gearz
d5892bbb32 My preliminary thoughts on OpenJPEG 2013-01-06 02:38:12 +01:00
Shyotl
0b31537bfe Updated llfile so that llofstream and llifstream actually work when given a file handle. 2013-01-05 17:13:35 -06:00
Shyotl
776a977824 Completed code migration to LLAvatarAppearance 2013-01-05 17:12:02 -06:00
Siana Gearz
20ae72e5fa CMake needs proper quoting 2013-01-05 23:25:47 +01:00
Siana Gearz
7fc4348f64 Fix build deselect 2013-01-05 22:14:10 +01:00
Lirusaito
5ec116021a Feature request: Alt-R for Region/Estate floater 2013-01-05 01:45:55 -05:00
Lirusaito
a992333744 Zi Ree's Debug Setting Floater awesomeness (Search!!) 
Made to work with Singularity, and also be a bit better..
Alphabetizes includes.
Switches settings combobox to a scrolllist, and Boolean combobox to a radiogroup.
Makes floater resizable, aligns a lot of the UI, and prepares it all for proper resize behavior.
Adds Copy button for copying the name of the debug setting.
Yay, verbosity! Also adds FloaterDebugSettingsRect to keep track of the floater's size.

Also somehow the getInstance line snuck out of last commit... tossed it in here.
 2013-01-05 01:43:17 -05:00
Shyotl
5cf091b8b2 Completed code migration from LLViewerWearable to LLWearable. 2013-01-05 00:33:55 -06:00
Shyotl
bea4bc6a1a Brought over lltexglobalcolor 2013-01-04 21:15:35 -06:00
Shyotl
9596514c79 Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata 2013-01-04 20:50:35 -06:00
Siana Gearz
fefe0df922 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-01-03 23:37:00 +01:00
Siana Gearz
509bdcb891 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-01-03 23:36:55 +01:00
Aleric Inglewood
2fbd53807c Do not use LLCachedControl as global variables. 2013-01-03 23:25:18 +01:00
Lirusaito
9498375e75 Update LLFloaterSettingsDebug to match up with v-d. 
Adds boost::bind and makes the floater a singleton.
 2013-01-03 17:20:57 -05:00
Aleric Inglewood
639b264d2d Do not crash upon corrupted HTTP header. 
This addresses the reported assertion by luis thibodeaux.
 2013-01-03 21:06:20 +01:00
Lirusaito
c3829485e4 Fixed LLCompileQueue messages via update to v-d in parts. Script resets now output properly~ 2013-01-03 14:08:39 -05:00
Lirusaito
88de1b28a2 Add MoyMiniMapCustomColor swatch to Vanity Preferences. 
Fixed spacing of MoyMiniMapCustomColor in settings_ascent_coa.xml and removed it from settings_per_account.xml

TODO: Make MoyMiniMapCustomColor more flexible.
-Added ColorCustomChat checkbox, pref code, and setting commented out.
 2013-01-03 13:59:14 -05:00
Siana Gearz
17e0c79fe7 Build fix Linux 2013-01-03 03:03:06 +01:00
Siana Gearz
ddef80d2cf Revert "Attempt to fix frame timer on broken mainboards" 
This reverts commit 5eb99b7d2f.
 2013-01-03 03:02:15 +01:00