| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts (manually merged):
linden/indra/llcommon/llversionviewer.h
linden/indra/llvfs/lldir.cpp
linden/indra/llvfs/lldir_mac.cpp
linden/indra/newview/CMakeLists.txt
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/Info-Imprudence.plist
linden/indra/newview/Info-meta-impy.plist
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/packaging/mac/Info.plist.in
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerversion.cpp
linden/indra/newview/viewerversion.h
linden/install.xml
Also some post merge tweaks.
|
| | |
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It defines the ViewerInfo module/namespace, which contains a variety
of functions for querying the viewer name and version. It is designed
to be a replacement for viewerversion.cpp and viewerversion.xml.
viewerversion.cpp has been removed, but viewerversion.xml remains
(albeit with a bogus version number) until the packaging system no
longer uses it.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* Moved numerous options out of the Advanced panel
* Moved numerous options out of the General panel
* Combined the Network and Web Browser panels
* Combined IM, Chat, and Spell checking preferences
* Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting
* Removed UI for 'hide my own group title'. This can still be set in the debug settings
* Renamed Popups > Notifications
* Renamed Chat Colors > Colors
* Renamed 'IMs and Logging' to 'Logging and Privacy'
* Moved Colors next to Skins
* Added style guide to the top of every preferences panel xui
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* split the "voice" debug tag into several tags for usable filtering while debugging
* remove debug-spam from user view by:
* remove capability request spam by:
* llstartup the voice client state engine when actually a region is present, and not the initial fake region.
* don't request a capability to determine if (the very same) capability can be requested.
* don't do it over and over as if a capability rezzed in like an avatar. Its available - or not (see llstartup).
* unload the daemon if not used.
* load vivox daemon depending on specific criteria in the caps
* remove the partial implementation to load a specific daemon with via the openregion message or the login response.
* discard obsolete caps.
Tested and working on linux: Parcel changing, region changing, (SL) voice-disabled region private call, (SL) private call region changing, (OS) no voice <-> voice region changing, (OS) mumble <-> freeswitch region changing.
To test: Mac, Win. Anything that needs to be tested and not mentioned above.
|
| | |/
| |/| |
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.
|
| | |
| | |
| | |
| | |
| | |
| | | |
The web page to load is defined by the setting "NewsBarURL".
Default is "http://app.kokuaviewer.org/news/", which will display
links to the latest Imprudence/Kokua blog posts, etc.
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
changes to llSensor LSL function
(Partial cherry-pick of commit d13d991d2d29bd3d0cc9a0d4e5480a0705681d06)
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 282cb19508dcd38039454dfe71d23bb042fe376c)
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Gives more control over font sizes, addresses font being smaller
than some users desire.
|
| | |
| | |
| | |
| | | |
enabled and opening the snapshot window with bad settings
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Revert back if letters start showing crazy leading again
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
in non-grid-specific folders
|
| | |
| | |
| | |
| | | |
Also fixed several inventory search bugs by updating desc. etc. searches to the latest Emerald version
|
| | |
| | |
| | |
| | | |
possible for OS
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Choosing a font sets FontChoice setting, but no real effect yet.
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
audio controls
|
| | |
| | |
| | |
| | | |
time (voice can now be included from here on out :)
|
| | |
| | |
| | |
| | |
| | | |
This will populate the grid list for users who can't update the list from
our web site, e.g. because of a firewall or network trouble.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
llGetLinkNumberOfSides
|
| | | |
|
| | |
| | |
| | |
| | | |
They were unintentionally(?) changed to Avination in 521f7558.
|
| | |
| | |
| | |
| | | |
option
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
linden/indra/llmessage/message.cpp
linden/indra/newview/llprefsadvanced.cpp
|
| | | |
| | | |
| | | |
| | | | |
Adding both, to be sure, and I've not seen anyone using it anyway.
|
| |\ \ \ |
|
| | | | | |
|