| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| | |
clean up primbackup.cpp). Based on Henri Beauchamp's patch
|
| | |
|
| | |
|
| |
| |
| |
| | |
(cherry picked from commit 18464593de52a31fa098f5ee5e543d9a44f1889e)
|
| | |
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Temporary bandaid until IMP-182 is fully fixed.
|
| | |
| | |
| | |
| | |
| | | |
It's intended to be used for informing the user that a feature is not
available on a certain operating system(s).
|
| | | |
|
| |/ |
|
| |
| |
| |
| |
| |
| | |
Since meta7 is no longer a legally allowed name, and since this viewer is no longer part of that dead company, got rid of those skins.
Also removed the silver skin.
Made things a tiny bit easier for the next time I have to do this.
|
| |
| |
| |
| |
| |
| | |
unreasonably limited their LODfactor.
12 is pretty much "almost too far away to see", so is a reasonable upper limit.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
whole system is.
In this case, fixing the viewer menu color breaks the login menu bar.
Seems like a better breakage alternative for the beta, though
(cherry picked from commit 084bd7a120e9ac122e4356246a1da57fd8f1204e)
|
| |
| |
| |
| | |
(cherry picked from commit bcfe397d0f3ab2bd8df3f8055f089824dd082bf4)
|
| |
| |
| |
| | |
Mostly, use of unicode symbols instead of ASCII approximations
|
| |
| |
| |
| | |
Almost all, anyway. Also patched up items in English version that were not translatable because of missing XUI attributes.
|
| |
| |
| |
| | |
the Open Icon Library (http://openiconlibrary.sourceforge.net)
|
| | |
|
| |
| |
| |
| |
| |
| | |
Before, the texture_picker widget in the "Local Texture Properties"
floater was interactive, even though using it had no effect. Now it is
disabled (noninteractive), to avoid misleading or confusing the user.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
(cherry picked from commit 282cb19508dcd38039454dfe71d23bb042fe376c)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
CacheWillClear, CacheWillBeMoved, ChangeConnectionPort, ChangeSkin,
and ChangeFont.
There are many other alerts that should be made non-modal in the future,
but this should prevent a focus fight with the Vivox policy window.
|
| | |
| | |
| | |
| | |
| | | |
If this causes blurry fonts for a user, they should enable
"Force integer font sizes" in Preferences > Fonts.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
1.3 release notes and commits in the first Experimental release. Please add any other names we're missing
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Also fixed several inventory search bugs by updating desc. etc. searches to the latest Emerald version
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
This compensates for inherent size differences in each font family,
so that UI text is a consistent size, no matter which font you use.
|
| | |
| | |
| | |
| | |
| | | |
SansSerif is now an alias for either "DejaVu" or "Liberation",
depending on the user's FontChoice setting.
|
| | |
| | |
| | |
| | | |
Choosing a font sets FontChoice setting, but no real effect yet.
|
| | | |
|
| | | |
|