Commit Graph

2826 Commits

Author SHA1 Message Date
Lirusaito
0770150455 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-08-10 23:30:16 -04:00
Lirusaito
d79a8fc87b Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2012-08-10 23:27:42 -04:00
Lirusaito
486536f92d Allow antispam time to be set to 0, for disabling Antispam. 2012-08-10 18:41:50 -04:00
Siana Gearz
f5923860fa Remove maximum selection limit of 20 friends, no longer present in viewer 2/3 2012-08-09 15:39:22 +02:00
Siana Gearz
adc2921f38 Fix push to talk lock 2012-08-09 15:28:04 +02:00
Siana Gearz
ca630a106e Merge fix 2012-08-09 15:21:38 +02:00
Siana Gearz
e616b40c6f Autodetect music stream type properly 2012-08-09 05:09:02 +02:00
Siana Gearz
26109ca8f9 Assert fix 2012-08-09 04:50:48 +02:00
Siana Gearz
46e57d4f1c Package FMOD Ex on Linux 2012-08-09 03:46:24 +02:00
Siana Gearz
7743843a27 Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
2012-08-09 03:46:03 +02:00
Siana Gearz
c84e145557 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp
2012-08-09 02:11:14 +02:00
Siana Gearz
de74443d76 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
2012-08-09 00:42:23 +02:00
Siana Gearz
f3e7340118 Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer
Conflicts:
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
2012-08-09 00:02:50 +02:00
Lirusaito
efe3dd77fa Address Issue 91: Estate ban button added to radar
Shift-Enter in radar now starts an IM with people selected.
Also, it seems Dark used black for texts and should... so... let's reverse that change.
2012-08-08 15:51:26 -04:00
Lirusaito
5ce8770dc3 Fix Issue 304: export texture in png too
code adapted from that bird that burnt to death...
2012-08-08 10:50:17 -04:00
Damian Zhaoying
e9ddd6b8f8 Merge remote-tracking branch 'upstream/master' 2012-08-08 01:03:49 -03:00
Siana Gearz
96a4e16a4b Don't feed empty, non-working callback to CURL 2012-08-07 18:21:36 +02:00
Siana Gearz
68ad5411c9 Shyotl's old llcurl 2012-08-07 13:13:45 +02:00
Lirusaito
d2210414bc Misplaced closing parenthesis... 2012-08-06 23:15:50 -04:00
Lirusaito
e6e9a21597 Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2012-08-06 20:33:21 -04:00
Lirusaito
f9b3561ca8 Typo fix 2012-08-06 17:24:01 -04:00
Damian Zhaoying
ce415fb65c Merge remote-tracking branch 'upstream/master' 2012-08-06 15:56:30 -03:00
Shyotl
1a6c00ca8b Display pathfinding attributes in build floater. 2012-08-06 12:26:28 -05:00
Shyotl
58033d3cbc Added rebake navmesh button. Brought in rest of the underlying navmesh implementation. 2012-08-06 10:11:12 -05:00
Lirusaito
4c23ab029a Missing Strings.
Oops.  Customize Floater wants these for like once case...
2012-08-06 02:38:09 -04:00
Lirusaito
0846f8a963 Fixeds and ToDones
-Color Fixies-
Fixed Gemini skin not looking as it originally did.
We now use DefaultListText to color all otherwise uncolored text in scroll list cells.
All of our dark skins have been updated to use white here, as dark skins are intended to have white text...
This includes the Dark we ship with.

LLFloaterActiveSpeakers no longer uses hard coded font colors, it uses SpeakersInactive, DefaultListText, and SpeakersGhost.

LLFloaterAvatarList no longer uses hard coded font colors, it uses DefaultListText, RadarTextChatRange, RadarTextShoutRange, and RadarTextDrawDist, in place of previously hard coded font colors
Since the tooltip defines color meaning, these new colors should only be skinned to change shade.

DefaultListText defaults to black; SpeaksInactive, gray(grey4); SpeakersGhost, Red; RadarTextChatRange, Red; RadarTextShoutRange, Yellow(yellow1); RadarTextDrawDist, Green(green2).


-Translation update and fixies-
Partial credit to viewer-development, thanks for hanging onto old strings!  Also, updated to look more like v-d in translated areas.
Punctuation strings can be used quite a lot.  Brought them all in, just in case.

AscentPrefs*:
Drag and Drop points now use CurrentlySetTo, CurrentlyNotSet, AnItemNotOnThisAccount, and NotLoggedIn. (applies, as well, to FloaterAO)
Power User message is now built from PowerUser1, PowerUser2, Unlocked:, PowerUser3, RightClick, PowerUser4 and PowerUser5; this should give translators enough space to explain any tough to translate, and make the message easier to alter in the future, if necessary.

LLCompileQueue:
Now uses translation strings from upstream
Starting, Done, Resetting, Running, and NotRunning in its xml.
CompileQueueTitle, CompileQueueStart, CompileQueueDownloadedCompiling, CompileQueueScriptNotFound, CompileQueueProblemDownloading, CompileQueueInsufficientPermDownload, CompileQueueInsufficientPermFor, CompileQueueUnknownFailure, ResetQueueTitle, ResetQueueStart, NotRunQueueTitle, and NotRunQueueStart from strings.

LLFloaterAvatarList(floater_radar) now uses has_entered, has_left, the_sim, draw_distance, shout_range, and chat_range in its xml for translatable alerts.

LLFloaterLand(floater_about_land) now uses minutes, 1_minute, 1_second, seconds, and remaining from its xml.
LLFloaterLand, LLFolderView, LLPanelDirBrowser now make use of InventoryNoMatchingItems, NoneFound, and Searching in their searches.
LLFolderView was brought closer to v-d in translation.

LLGroupNotify now uses GroupNotifyGroupNotice, GroupNotifySentBy, GroupNotifyAttached, next (also now used by LLNotify), ok, GroupNotifyGroupNotices, GroupNotifyViewPastNotices, GroupNotifyOpenAttachment, and GroupNotifySaveAttachment.

LLInventoryFilter synced with V-D for translation:
Now uses Animations, Calling Cards, Clothing, Gestures, Landmarks, Notecards, Objects, Scripts, Sounds, Textures, Snapshots, No Filters, Since Logoff, and Worn.

LLManipRotate now uses Direction_Forward, Direction_Left, Direction_Right, Direction_Back, Direction_North, Direction_South, Direction_West, Direction_East, Direction_Up, and Direction_Down, like upstream v-d.

LLPanelAvatar(panel_avatar) now uses None string in its xml for when there are no groups, also removed cruft. Though the None has not been showing up for quite some time, anyway...

LLPanelObjectInventory now uses Buy, LoadingContents and NoContents,
however the last two strings did not seem to show up anyway...
thanks to Latif Khalifa, Jean Horten, theGenius Indigo and Cubbi Bearcat for confirming this happens across many different versions and on both Windows and linux(32 and 64).

LLPreviewScript now uses CompileSuccessful, SaveComplete, ObjectOutOfRange, and CompileSuccessfulSaving.

LLScrollingPanelParam now translates Less and More.
Avatar Shape Information strings now used for customize appearance panels.

LLTextureCtrl now uses multiple_textures.

LLToolpie has been updated to use v-d include order and now uses UnmuteAvatar, MuteAvatar, UnmuteObject, and MuteObject2 strings.
LLVOAvatarSelf now uses BodyParts* strings for translation of toolpie entries pertaining to bodyparts.

LLViewerMenuFile now uses UnknownFileExtension, and UploadingCosts.

LLViewerMessage now uses Cancel(also used by LLViewerDisplay), AcquiredItems, Saved_message, IM_autoresponse_sent_item, IM_autoresponded_to, IM_announce_incoming, InvOfferDecline, InvOfferGaveYou, InvOfferOwnedByUnknownUser, InvOfferAnObjectNamed, InvOfferOwnedBy, InvOfferOwnedByUnknownGroup, and InvOfferOwnedByGroup.


-AvatarRadar Update-
AvatarRadar enhanced with code from both Cool VL Viewer and some avian corpse.
e_radar_alert_type has been reworked to allow bitwise usage in the future.

Cool stuff:
gSavedSettings for radar are now CachedControls,
entering boolean is now checked before going into the switchcase,
Style changes, yay C++ style.

Avian Flu:
Distance for shout range corrected to be 96.
handleKeyHere: If the user hits enter with an avatar on the radar selected, focus camera on selected avatar; ctrl-enter, teleport to selected avatar.

Otherwise:
Tiny spelling fixies, and a suggestive comment.
2012-08-05 20:40:02 -04:00
Shyotl
b847c53395 Implemented basic 'awareness' of objects flagged as permanent. 2012-08-04 20:46:51 -05:00
Shyotl
aca3e8f6c4 Cleanup. Removal of dead code. Added/renamed object flag accessors. 2012-08-04 18:18:22 -05:00
Shyotl
7122a7c174 Added sim console. 2012-08-04 13:43:32 -05:00
Drake Arconis
769a7b89d2 More Media Updates
Further updated llviewermedia
2012-08-03 23:14:03 -04:00
Shyotl
d2b13f515d Avoid several excessive per-frame LLView::getChildView calls by instead caching the results in postBuild. (Added CachedUICtrl, which is basically just a self-nulling pointer to not have to make ui ctors dirtier) 2012-08-03 20:51:53 -05:00
Shyotl
ef601d3345 Implemented a hash-map for first-level children of ui elements. First-level child lookups are prolificly abused on a per-frame basis, and a plain old loop with a string comparison each iteraton was somewhat of a hotspot. (The recursive loop after is even more expensive, however) 2012-08-03 13:20:26 -05:00
Shyotl
d9e5601e10 Manually vectorized some of the UI vertex operations. 2012-08-03 13:12:02 -05:00
Shyotl
c385133c84 Fixed noisemap not binding for the nightvision shader. 2012-08-03 13:10:16 -05:00
Damian Zhaoying
b91a670c05 some spanish language files fixes 2012-08-03 14:13:19 -03:00
Drake Arconis
c90c8e0f4b OpenID
Added support into client for openid
2012-08-03 11:32:36 -04:00
Damian Zhaoying
0a8cd6d03d Merge remote-tracking branch 'upstream/master' 2012-08-03 11:05:30 -03:00
Drake Arconis
af89351432 Cookies.
Enabled use of the cookie store.
2012-08-03 08:49:01 -04:00
Drake Arconis
fb81754880 STUPID TEMP FILES 2012-08-02 23:29:12 -04:00
Drake Arconis
dc5bfc1c41 Bit of cleanup
More cleanup and updates to llcommon
Removed legacy code and files
2012-08-02 23:19:07 -04:00
Lirusaito
2c65da3397 Make viewer_manifest.py smarter.
Use newlines as delimiter to avoid strange characters and spaces breaking xargs.
2012-08-02 15:50:20 -04:00
Lirusaito
abc1d185b7 Gemini keywords update. 2012-08-02 10:22:01 -04:00
Lirusaito
124eba4371 Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
2012-08-02 10:18:17 -04:00
Damian Zhaoying
a673496ed3 Update Spanish Translation, All files translated and up to date 2012-08-02 09:08:57 -03:00
Drake Arconis
af2a49afa7 Fixed linux64 libpng copying 2012-08-02 05:39:02 -04:00
Drake Arconis
b151796e0e Updated LSL Funtions
Updated the functions, constants, tooltips, etc for os,aa, and secondlife
2012-08-02 05:38:23 -04:00
Drake Arconis
828b2c9bc0 Merge remote-tracking branch 'shyotl/master' into AltCompilers 2012-08-01 21:41:36 -04:00
Lirusaito
1c9f996248 Make "Autorespond to people you have muted" an independent toggle for that type of autoresponse.
Trivial fix to carry users along, not needing to autorespond to anyone in order to autorespond to mutes.
I was working on a complete rewrite months ago, I have to dig that up, even still this system needs to be redone, ground up.
2012-07-31 03:37:10 -04:00
Lirusaito
594dc64a43 Made Post-Process Settings floater far better looking 2012-07-30 11:03:20 -04:00
Lirusaito
1b69994ffa Respect graphics requirements for FBOs and Hardware Skinning in graphics preferences, properly. 2012-07-29 22:25:41 -04:00