Commit Graph

1030 Commits

Author SHA1 Message Date
Latif Khalifa
1c2cdd4166 Work in progress: Collada export 2013-07-15 06:38:12 +02:00
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
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
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
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
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
Latif Khalifa
f9b174c1c2 Merge branch 'master' of https://github.com/MelanieT/SingularityViewer 2013-07-08 17:54:57 +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
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
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
7f981e6f17 'Typeregionname' combobox should have an empty value. Was hosing up logic in LPanelLogin::onUpdateStartSLURL. 2013-07-03 17:19:39 -05:00
Lirusaito
d623fd37cc Feature Request: Web Search Tab in Legacy Search! 2013-07-03 05:44:48 -04:00
Lirusaito
e199d5f867 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-07-01 21:13:11 -04:00
Lirusaito
11c311cd49 Optional V3 Web Search and support for search SLURLs
Added "Use web-based search instead of legacy v1 search" checkbox to System->General preferences

Unified all functions to display search floater into toggle_search_floater and LLFloaterSearch::showInstance
Added UseWebSearch and UseWebSearchSLURL debug settings for flexible configurations
- SLURLs with legacy search cannot always present the same results as web
Added SearchURL debug setting, a separate setting from the one used in the all tab, slightly different and always set by response["search"] on OSGrid logins to detect if websearch is supported
Cleaned up llfloaterdirectory includes and added "Search.WebFloater" to the CommitCallbackRegistrar in case we ever want to add a button or something to open web search (couldn't find a nice place for it, sadly), also added more functions to show specific tabs and performQueryOn to search a tab with specific query on LLPanelDirBrowser's
2013-07-01 16:17:46 -04:00
Lirusaito
609dba3926 Update Floater World Map, add support for worldmap and maptrackavatar slurls (Find on map and show pick on map in web profiles)
Cleaned up includes, switched callbacks over to mCommitCallbackRegistrar, updated RLVa portions to RLVa 1.4.5, changed mSLURL from a string to a real SLURL
2013-06-30 15:38:27 -04:00
Latif Khalifa
0e159e47cd Merge remote-tracking branch 'shyotl/master' 2013-06-28 23:18:39 +02:00
Shyotl
8bca439a5a Fixed layout_panel being incorrectly resizeable in browser floater, and made layout_panel width more consistent in panel_progress.xml 2013-06-28 14:39:13 -05:00
Lirusaito
cf189beb86 Update French vanity preferences and put a name in for a checkbox I'd forgotten to name, thanks Nomade~ 2013-06-28 09:12:23 -04:00
Lirusaito
6f701c413a Remove the makeshift visibility_control from llprefsvoice.cpp in favor of using a real one 2013-06-28 08:25:13 -04:00
Lirusaito
b1abffbce1 Address Issue 879: Ability to copy Group URI
Spanish Button Translation from Firestorm
Also: Realigned includes in llpanelgroup.cpp to diff nicer with upstream
2013-06-28 08:22:30 -04:00
Lirusaito
9bdbf6b987 French Translation positioning fix-up from Nomade Zhao 2013-06-28 07:22:05 -04:00
Lirusaito
b7c4532766 Solve Issue 521: Web profile support
Adds a checkbox "Use web profiles instead of legacy v1 profiles" to System->General preferences
Adds a button "Web Profile" to the first life tab of legacy profiles (only available on grids that provide a web profile url)

When connecting to an OSGrid, always set the WebProfileURL setting to whatever is in web_profile_url, this way we know if web profiles are not supported.

Borrowed translations of the preference checkbox from Firestorm, translators may want to tweak
Translators may want to update panel_avatar.xml as it now has a web profile button, and contents have shifted slightly.
2013-06-28 07:18:59 -04:00
Latif Khalifa
34dad3ba04 Merge remote-tracking branch 'shyotl/master' 2013-06-28 05:48:46 +02:00
Shyotl
93ca5d3482 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap
Conflicts:
	indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
2013-06-27 22:07:31 -05:00
Shyotl
dbf8845834 Fixup active speakers floater 2013-06-27 20:21:32 -05:00
Lirusaito
de97a7c9f7 Add floater_media_settings.xml to translations, and fix its title to fit in with the other floater titles 2013-06-27 18:58:01 -04:00
Latif Khalifa
7855071ce8 Merge remote-tracking branch 'lirusaito/VoiceUpdate' 2013-06-27 23:31:46 +02:00
Lirusaito
e07581f14d Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-06-27 06:00:21 -04:00
Drake Arconis
258d39e432 Coffee time. 2013-06-27 05:57:36 -04:00
Drake Arconis
d00fca05e9 Cleanup from review 2013-06-27 05:39:04 -04:00
Lirusaito
198091c2a0 Solve Issue 738: Improve .anim upload floater 2013-06-27 02:31:42 -04:00
Lirusaito
19367b517c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
Conflicts:
	indra/llui/lluictrl.cpp - Silly mergestuffs
	indra/newview/llfloatermediabrowser.cpp - deleted
	indra/newview/llpanellogin.cpp - updated functions went poof

Compile Fixies:
	indra/newview/llfloaterwater.cpp - I missed a spot with notificationsutil, it seems.
2013-06-26 12:37:31 -04:00
Lirusaito
14736d24a5 Update LLFloaterWater and LLFloaterWindLight, to be closer to their upstream counterparts. 2013-06-26 09:07:34 -04:00
Lirusaito
5a9a0e0b1b Upload code cleansing
I found our upload classes were in need of a tune up while researching Issue 896: Animation upload setting causes viewer crash
So I started working to clean up llfloaterbvhpreview which lead me to llfloaternamedesc and the rest of our upload floaters
I ended up pulling the sound upload hack out of LLFloaterNameDesc and into LLFloaterSoundPreview and moving LLFloaterAnimPreview into llfloaternamedesc.*
Updated llviewermenufile.cpp a bit
Removed setUploadAmount from LLFloaterImagePreview and LLFloaterBvhPreview as its purpose is served by LLGlobalEconomy::getPriceUpload and the hippogridmanager too.
Fixed an issue with floater_animation_anim_preview.xml using [AMOUNT] instead of [UPLOADFEE] for its label.

I'd say this might fix Issue 896, I certainly can't reproduce the crash I was having when testing for it anymore.
2013-06-26 03:51:27 -04:00
Lirusaito
139a10e77c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llpanelface.* -Knew these would conflict just from proximity
2013-06-25 23:49:04 -04:00
Lirusaito
8fb8e74e54 Fix the crash upon hitting select for an object's light color feature
Modernizes LLTextureControl(, LLFloaterTexturePicker) and LLColorSwatch
Updates LLPanelVolume, LLPanelObject, and LLPanelFace to prevent related crashes and compile.

Adds translation string InventoryNoTexture to strings.xml (added to all existing translations from upstream translation)
2013-06-25 23:02:15 -04:00
Lirusaito
c2cc398339 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
2013-06-25 19:37:50 -04:00
Shyotl
2793ca9e04 Applied moap beacon patch. 2013-06-25 16:21:51 -05:00
Shyotl
e011517849 Widen login/teleport progress bar. Fixed toolbar/overlaybar appearing over login progressview. Updated progressview a bit. Added drawcontext alpha support to llprogressbar. Fixed issue with prim media control panel blocking mouseclicks on upper portion of on-prim media. 2013-06-25 10:29:48 -05:00
Lirusaito
45bbf52771 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 22:36:55 -04:00
Lirusaito
3739639295 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
	indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.

Compile fixies:
	indra/newview/llavataractions.cpp needed to include llnotifications.h
	indra/newview/llvoicechannel.cpp needed to include llnotifications.h
2013-06-23 22:36:04 -04:00
Lirusaito
e7669cc94b Add setting to prevent script errors from stealing focus 2013-06-23 04:05:25 -04:00
Lirusaito
d4bed6382c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 02:25:15 -04:00
Shyotl
67df523f10 LLChatBar can't betreated as a LLPanel and a LLLayoutPanel at the same time. Demoted to just an LLPanel (fixes issues with follow attribute). 2013-06-22 17:27:09 -05:00