| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
I need to study what they did more closely. At least the script itself is here, to remind me to fix it. lol
|
|
|
|
| |
Definately needs more work at a deeper level.
|
|
|
|
|
|
| |
Removed LL grids, this viewer is not compliant with their policy.
Removed OSGrid, they seem bent on banning users for no good reason.
Added others that are where meta-impy users are likely to be hanging out.
|
|
|
|
|
|
| |
unreasonably limited their LODfactor.
12 is pretty much "almost too far away to see", so is a reasonable upper limit.
|
| |
|
|
|
|
| |
think. lol
|
|
|
|
| |
that I have reconsidered, fix up some actual problems.
|
|
|
|
| |
Plus, meta-impy default log level is warn, and we want to see them.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
| |
| |
| |
| | |
(cherry picked from commit 7d6337fb7683546c17c922aa1b0f7e3ca5982448)
|
| |\ |
|
| | |
| | |
| | |
| | | |
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)
|
| | |
|
| | |
|
| |
| |
| |
| | |
than just replace unstyled text
|
| |
| |
| |
| |
| | |
[ From Tonya Souther's 672:143c811ee5e2 and 688:1900969ebf65 in phoenix-sg ]
(cherry picked from commit d3ffe737a82e4bf54ce1413efeb7e92f43dfccca)
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |/
| |
| |
| |
| |
| | |
Before, a disabled texture_picker widget would still open a floater
when clicked, change the mouse cursor on hover, and accept
drag-and-drops. Now, it actually behaves in a disabled way.
|
| | |
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is accomplished by dynamically reordering the CMake variable
CMAKE_CONFIGURATION_TYPES so that the current build type (the value
of CMAKE_BUILD_TYPE) is listed first.
|
| | |
| | |
| | |
| | | |
Build the "package" target in Xcode to create a DMG.
|
| | | |
|
| | |
| | |
| | |
| | | |
Run "make package" in the build directory to create a tarball.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
viewer_info.py provides a way to easily query the viewer name and
version (from viewerinfo.cpp). It replaces build_version.py, which has
been removed. BuildVersion.cmake has been updated to use
viewer_info.py instead of build_version.py.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The various http textures request range bugs are fixed in Opensim
0.7.1. Also, this workaround was ugly, hacky and buggy.
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 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.
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
not asked to
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
are there any render_compat grids anyway?
|
| | | | | | |
|