Commit Graph

4623 Commits

Author SHA1 Message Date
Latif Khalifa
5669b01873 Ask for confirmation of partial Wavefront exports
Fix some signed/unsigned warnings
2013-07-12 09:50:04 +02:00
Latif Khalifa
c769510c6f Merge remote-tracking branch 'lirusaito/master' 2013-07-12 08:15:05 +02:00
Latif Khalifa
77f77b03b0 Merge remote-tracking branch 'shyotl/master' 2013-07-12 07:23:27 +02:00
Shyotl
ccff8475c1 Mesh vertex corruption fix taken from LL upstream. 2013-07-11 20:54:04 -05:00
Shyotl
6be6f488ba Added setting to toggle autoplaying of prim media, independent of parcel media. Audio autoplay also now yieds to sounds being stopped via nearby media panel. 2013-07-11 20:53:12 -05:00
Aleric Inglewood
6a7f7bf4de Oops - forgot something in last commit.
Now it works :). Tested with ssb too.
2013-07-11 00:31:21 +02:00
Aleric Inglewood
df71d4518e Merge remote-tracking branch 'singu/master' 2013-07-10 21:31:49 +02:00
Aleric Inglewood
96b5f7bdc8 Add wearable exporting / importing in linden_genepool format.
As importing has been broken for a long time, I decided to
hijack the existing (broken) buttons of the Appearance floater
for the following new implementation:

The currently selected wearable, if full perm and the agent
is owner (of course) and creator, then that wearable can be
exported to disk with AIFilePicker in the context "archetype".

The used format is now XML, linden_genepool version 1.0, the
same format that is used when saving from Advanced --> Character
--> Character Tests --> Appearance to XML in any viewer.
However, unlike that Advanced option (which normally only
works when DebugAvatarAppearanceMessage is set to TRUE, ie in
the official Linden Viewer; but that does a lot more, most
likely unwanted things: it causes to dump files in this format
to the LL_PATH_LOGS directory whenever appearance data comes
by and other stuff for debugging purposes only), now ONLY the
selected wearable is written to the file. In the case of multiwear
with several layers, that means the selected layer, as well.

When importing these XML files again, only the selected
wearable/layer is overwritten (assuming it is modifiable) with
the data in the file that corresponds to that wearable (if
the file contains data of another wearable then nothing happens).

Note that this file format can be read by blender-avastar:
Using this feature to save the shape you created in SL will
allow you to import that into blender. Likewise, a shape created
or modified in blender can be imported into SL using this feature.
2013-07-10 21:19:42 +02:00
Aleric Inglewood
b97caa77d4 Add versioning support to AIFilePicker.
When saving a file, if the suggested filename has the form
PREFIX?000.EXT then the viewer checks if that file already
exists and if so, increments the number until it finds a
name that does not already exist (in the suggested directory).
The '?' is replaced with an underscore.

This allows to fast saving of the same data without overwriting
previous data.
2013-07-10 21:19:04 +02:00
Lirusaito
dfb4370a56 Remove iamHereLogin remnants overlooked in 62f03bc489 2013-07-10 08:12:13 -04:00
Lirusaito
7e874d7d56 Fix Issue 931: When viewing the profile of a muted avatar, the Mute button should be changed to Unmute 2013-07-10 07:35:50 -04:00
Lirusaito
742ccdcf0c Touched up awavefront once more to conform to permissions and be used as intended
Added debug settings OBJExportNotifyFailed and OBJExportNotifySuccess for whether or not to notify about OBJ Exports failing or succeeding respectively
Moved exports back into tools submenu, there's not enough variety to justify a menu dedicated to exportation
Removed hardcoded "Insufficient Permissions" string, there's already a notification for this.
Implemented proper permissions checking, along with own Avatar Export.
2013-07-10 06:30:19 -04:00
Shyotl
8f3c1af82d Fixed textentry combobox arrow positioning issues. 2013-07-10 02:15:47 -05:00
Latif Khalifa
8e503f2596 Added Wavefront OBJ format exporter
Exporter written by Apelsin:
https://github.com/Apelsin

TODO: Hookup avatar export
2013-07-09 22:04:27 +02:00
Aleric Inglewood
4779f91d5d Fix Appearance Import button.
Params are driven by wearable; changing the base character gets
overwritten real quick.

Fixed to call the appropriate LLWearable::setVisualParamWeight.

I didn't test this in the light of multiwear -but it works for
the shape, which is good enough.
2013-07-09 03:09:06 +02:00
Latif Khalifa
62f03bc489 Fix loading the splash page from some broken OpenSim servers
Remove HTTP HEAD request that was made before the attempt to load
the splash web page before the URL was handed over to the WebKit
plugin
2013-07-08 21:18:09 +02:00
Latif Khalifa
f9b174c1c2 Merge branch 'master' of https://github.com/MelanieT/SingularityViewer 2013-07-08 17:54:57 +02:00
Aleric Inglewood
6103cb23e6 Allow people to login again. 2013-07-08 17:25:06 +02:00
Aleric Inglewood
d725be37f9 Merge remote-tracking branch 'singu/master' 2013-07-08 02:05:09 +02:00
Aleric Inglewood
fcf099a115 Add file picker for issue 630 2013-07-08 00:57:03 +02:00
Aleric Inglewood
ebfbdac5ab Compile error work around. 2013-07-07 23:37:05 +02:00
Melanie
d43d103870 Remove the untranslated credits and licenses and the empty elements from the German translation. 2013-07-07 04:27:51 +02:00
Melanie
c20cffa33d Change "Object say, text" to "Object: text" like it used to be. The former is just bad english. 2013-07-07 04:25:48 +02:00
Apelsin
a5edfdd376 Non-MO adjustment
(Gross typo)
2013-07-06 08:37:11 +02:00
Apelsin
9226c65e0c Disable this by default... 2013-07-06 08:25:46 +02:00
Apelsin
7439f48223 Featurebug
=== Pull request version ===
Re-enabled fix for avatar body invisibility featurebug (archaic)
Added option to adjust maximum attachment span with settings
Added option to enable automatic derendering of huge attachments (use with care)

Conflicts:
	indra/newview/app_settings/settings_effervescence.xml
2013-07-06 08:25:10 +02:00
Aleric Inglewood
ad6c539609 Crash fix 2013-07-06 00:06:51 +02:00
Aleric Inglewood
008a0936da Compile fix 2013-07-05 23:55:20 +02:00
Latif Khalifa
f1e493291a Merge remote-tracking branch 'shyotl/master' 2013-07-05 22:37:13 +02:00
Latif Khalifa
a329928dcd Merge remote-tracking branch 'melanie_t/master' 2013-07-05 22:36:52 +02:00
Latif Khalifa
f2323c0c83 Merge remote-tracking branch 'aleric/master' 2013-07-05 22:36:35 +02:00
Shyotl
bbb0bd54bf Fixed location combobox not updating properly when a slurl link is clicked. Reset the location combobox when a different grid is selected (added setCurrentGridChangeCallback to hippogridmanager). Moved login panel elements into a layout_stack so hiding the grid or location columns no longer leaves big empty gaps. 2013-07-05 02:28:36 -05:00
Melanie
5395de3e34 Add german translation preview (81% complete) 2013-07-05 06:11:19 +02:00
Shyotl
624141a31a A break was missing from case logic in LLPanelLogin::onUpdateStartSLURL 2013-07-03 17:21:45 -05:00
Shyotl
7f981e6f17 'Typeregionname' combobox should have an empty value. Was hosing up logic in LPanelLogin::onUpdateStartSLURL. 2013-07-03 17:19:39 -05:00
Shyotl
c82ac0b0af Added several missing mouse-event callback signals to LLUICtrl 2013-07-03 17:18:26 -05:00
Shyotl
0219186106 Use SHGetKnownFolderPath on vista/win7/win8, instead of deprecated SHGetSpecialFolderPath. 2013-07-03 17:16:37 -05:00
Shyotl
8310575fc3 added LLProgressView::abortShowProgress. Issue upon failed login to terminate pending loginpanel destruction which was killing the actual 'new' replacement loginpanel instead of the old to-be-deleted version. 2013-07-03 17:15:30 -05:00
Shyotl
4455dd7eff When requesting an avatar reload, also reload all attachments (prior to this it was not possible to actually reload attachments on non-agent avatars) 2013-07-03 17:13:11 -05:00
Shyotl
b3d97b0860 Avoid running the motionblur shader if there hasn't been camera movement. Also clamp per-frame fragment velocity to reduce visual artifacts. 2013-07-03 17:12:12 -05:00
Aleric Inglewood
4b0b83797c CURLIO (and libcwd): add number of established connections to http console.
I need to parse the debug output of libcurl for this, and choose
to not do that for a Release build - at which point it makes little
sense to even do it for a Debug build, since also the Alpha release
are 'Release'. Even though it would probably have no impact on FPS,
there would be like two persons looking at that number and understanding
it.
2013-07-04 00:02:28 +02:00
Aleric Inglewood
e0c66138c7 Increase connect timeouts for capabilities that demand short transfer times.
The automatic adjustment sets the connect time to 3 seconds, which might
be a bit on the short side sometimes.

Also remove the HACK and use CurlTimeoutConnect again.
The default is still 10 seconds, but is overridden to be 30 for mesh
now (which needs a reconnect for every mesh, since LL does not support
connection reuse for mesh). Note that I never saw any successful
connect under 8 seconds while I had the connect time out at 30:
Over 8 seconds is a sure fail (except for mesh, where in rare cases
there were connect times of 15 seconds (never 14 or 16).

On quiet servers, the connect time is normally sub-second. This is
the bulk of connections for my own SL use.
2013-07-04 00:02:28 +02:00
Lirusaito
e9ce1a6357 Whoops, source code shouldn't be executable. 2013-07-03 05:49:50 -04:00
Lirusaito
d623fd37cc Feature Request: Web Search Tab in Legacy Search! 2013-07-03 05:44:48 -04:00
Lirusaito
27145699bf Update/cleanup llpanelpermissions 2013-07-02 19:05:53 -04:00
Lirusaito
92633b8c65 Solve Issue 907: Build -> Objecttexture -> Searchfield-activation 2013-07-02 04:22:59 -04:00
Lirusaito
e199d5f867 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-07-01 21:13:11 -04:00
Lirusaito
1de076c9c0 Fix two bugs for web search
1. When web search was open, because it had no id, it would steal the links clicked for the in-viewer browser, now it identifies as search and will not.
2. Work around an oddity with the browser being unresponsive to certain category only slurls, by temporarily removing the expected behavior of it returning as last seen when reopened (no setVisible(false) in onClose, just close out as normal)
2013-07-01 21:10:06 -04:00
Aleric Inglewood
6ee1bf3fae Merge remote-tracking branch 'singu/master' 2013-07-02 02:13:03 +02:00
Aleric Inglewood
59716ba86b Added progress meter in HTTP debug console. 2013-07-02 02:12:34 +02:00