Commit Graph

34 Commits

Author SHA1 Message Date
Aleric Inglewood
a5522c204e Save Preview As...
Replace 'Save Texture As...' in File menu with 'Save Preview As...',
since it's used for textures, sounds, animations, notecards and scripts,
which ever type you have open at the moment.

This fix addresses
http://code.google.com/p/singularity-viewer/issues/detail?id=12
2011-06-21 03:06:43 +02:00
Aleric Inglewood
b852a77a79 AIFilePicker related bug fixes.
Bug fix in LLPreviewAnim::gotAssetForSave_continued: the if()
that tests if the result from the filepicker can be used was
accidently negated, mostly causing a crash when cancelling an
animation preview download (open animation, File -> Save Texture As..),
and canceling the save when a filename is picked.

The lifetime of AIFileUpload is actually till the very end
of the main(), causing it's member mPicker to be reused.
This leads to problems. When someone tries to open a file picker
for a file upload of the same time before the previous filepicker
called the callback function (ie, when two filepickers are
opened at the same time, or when the plugin crashes).
With this fix it is possible to open any number of file pickers.

Finally, for linux, LLFastTimers was using assembly with gives
rather random results on multicore machines. Since AIStateMachine
is using this for wait timing, it had a negative effect on
how well the file picker worked (the last message wasn't flushed
for several seconds).
2011-06-21 02:49:34 +02:00
Shyotl
b691e2b286 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-06-08 14:19:43 -05:00
Shyotl
a07e399801 LLAgentCamera transition (1/2) 2011-06-07 21:35:10 -05:00
Aleric Inglewood
e1fb1fa6b7 API change of AIFilePicker.
Call AIFilePicker::create() instead of new AIFilePicker.
Renamed deleteMe() to kill() and bs_deleted to bs_killed.
Only default to auto destruct when created with create(true),
otherwise kill() has to be called explicitely.
2011-05-18 03:52:15 +02:00
Aleric Inglewood
a6cb676d4a Add AIDirPicker and use it. Remove indra/newview/ll{dir,file}picker.{h,cpp}.
Also removed some code from the Mac/windows code in
indra/plugins/filepicker/llfilepicker.cpp that shouldn't
be in there anymore (send_agent_pause/resume and updating
the LLFrameTimer stuff).
2011-05-11 03:01:34 +02:00
Aleric Inglewood
e0b0fa4f58 Use AIFilePicker everywhere.
Also upgrade the file picker filters with the new extensions found
in the orginal file picker code of Singularity.

Also improve AIFilePicker a bit: added hasFilename() and now
deleting the statemachine automatically by default: it's no longer
needed to call deleteMe from the callback.
2011-05-10 04:27:57 +02:00
Aleric Inglewood
e89d6d9d66 Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
This commit contains all changes, except those in indra/media_plugins
(which was renamed to indra/plugins) and indra/llplugin.

However, it does contain the (new) file
indra/plugins/filepicker/basic_plugin_filepicker.cpp
2011-05-08 17:10:38 +02:00
Shyotl
5954e0d71c Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
Shyotl
ac12349a8a Merge branch 'V2Renderer' into V2TextureSystem
Conflicts:
	indra/newview/llviewercontrol.cpp
2011-04-23 19:33:20 -05:00
Shyotl
f7a5394904 Super-sampling only to be done when taking a snapshot to disk in high-res mode. Clamping to 3x.
Removed 'SHHighResSnapshotForceTile' setting, as tiling is now the only way snapshots can be done.
2011-04-23 17:51:29 -05:00
Shyotl
98c2b7e11f Sorted out high-res snapshot issues.
LL has since removed high-res snapshots using render targets. I find this change to be favorable, as rendertargets were very finicky to get working with anti-aliasing. Also, deferred rendering uses many rendertargets that depend on screen resolution. Changing resolution every screenshot is.. not very awesome.

There is some deviation from LL's viewer. I've kept the old tiled glow pass enabled for non-deferred, as it fixes issues with tile edges truncating glow propogation. However, this does no work with deferred yet. I need to pin down why. I assume using binding one of the RenderTargets is required for deferred.

Additionally, the usage of a RenderTarget for snapshots is what prevented me from fully enabling my supersampling settings. Now that that hurdle is gone, I consider including this new setting by default to be safe enough.

And a note: Do not remove the 'tiling' variable when merging with v2 changes, as singu's glow pass is 'special'. There are other fixes absent from LL's viewer that require knowing if the render is tiled or not. (water reflections/cloud freezing)
2011-04-21 23:36:41 -05:00
Siana Gearz
5d5231fe8c Removed Import/Export 2011-04-18 23:28:27 +02:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Siana Gearz
18b10638be Stupid headers -.- workaround 2011-03-26 04:02:51 +01:00
siana
baac16b5d2 OpenJPEG experiment, PCH circumcision 2011-03-20 04:44:58 +01:00
Shyotl
343bb22b5c Fixed a snapshot crash 2011-03-14 16:30:09 -05:00
Shyotl
a207a71066 V2 llimage merge 2011-02-22 18:21:02 -06:00
unknown
f357842265 Variable high-res screenshot size + supersampling (non-deferred only) 2010-10-22 12:10:27 -05:00
Beeks
4cace48a9b Fixes for tattoo tinting - With any luck this will reduce the number of ruths.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-26 14:24:34 -04:00
Beeks
f8c2308c87 System Inventory beta - Working, but perhaps not as well as I'd like it to.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-24 20:06:33 -04:00
Beeks
973f53df5e COMMIT STORM:
Fixes for Temp uploads so they show up as they should and are actually usable.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-08 19:09:14 -04:00
CharleyLevenque
892573dfb4 Contact list categories and searching 2010-09-06 16:17:53 -04:00
CharleyLevenque
6a4b23d0bb Log Out button, Pose Stand, Minimum Camera Zoom 2010-08-31 21:07:01 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
phr0z3nt04st
9e390b5cf6 More repharasing....... 2010-07-02 20:48:12 -05:00
phr0z3nt04st
0acbf9c2d6 Griffer technology, rephrased bulk temp message. 2010-07-02 20:45:10 -05:00
phr0z3nt04st
d3e051ed58 Fixes and Temporary Uploads, plus temp on bulk upload too.... 2010-07-02 18:57:52 -05:00
phr0z3nt04st
5e7529ee36 Object textures can now be export and import 2010-06-21 16:12:24 -05:00
Hazim Gazov
8d8e59a947 separate import floater from import code 2010-05-04 13:29:10 -03:00
Hazim Gazov
4319caf5c9 added code for import, compensated for changes in the llapr library 2010-05-03 04:09:35 -03:00
Hazim Gazov
772f12eb43 Added hex editor by day oh, ported it to snowglobe trunk 2010-04-03 06:07:25 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00