| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious.
Conflicts:
.gitignore
linden/indra/cmake/00-Common.cmake
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerinfo.cpp
The usual branding conflicts.
|
| |
| |
| |
| | |
made it use menus (also added autosave and fixed the 'reset' button alignment being off while I was there)
|
| |
| |
| |
| | |
This reverts commit 87219855c664447a39dd7c2d8866f0a630d1c843.
|
| |
| |
| |
| | |
This also reverts 14f4622c and 534767ef
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts (merged manually):
.gitignore
linden/indra/newview/llgesturemgr.cpp
linden/indra/newview/viewerinfo.cpp
|
| |
| |
| |
| | |
these if sculpties ever go invisible that shouldn't
|
| | |
|
| | |
|
| |
| |
| |
| | |
and avatar files in the cache between restarts
|
| |
| |
| |
| | |
from disk
|
| |
| |
| |
| | |
button for 'rocks fall, everybody dies'
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts (manually merged the grids, ignored the other two):
linden/indra/newview/app_settings/default_grids.xml
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
|
| | |
|
| |
| |
| |
| | |
Meta7 is definitely gone, WorldSimTerra seems to be, too.
|
| |
| |
| |
| | |
It's only a testing/development grid, not intended for real use.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Imprudence tag color is part of our official branding. Users can
turn it off, but the color itself is not a matter of user preference.
This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233
and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two
widgets from Preferences > Colors.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
This should work around the 5% FPS slowdown caused by #614 and is
generally a good idea (unless it causes problems, in which case it's
definetely a bad idea).
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts (manualy merged):
linden/indra/newview/app_settings/default_grids.xml
linden/indra/newview/primbackup.cpp
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/notifications.xml
InWorldz specific crap removed.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
... in favor of setting the select distance differently between
opensim and second life in the hippo limits
(cherry picked from commit 2545b11e06538010bd5ddb46499920a43889ed0f)
|
| | |
| | |
| | |
| | | |
fetchinventoryonlogin2 so it's enabled for users of previous versions
|
| |/
| |
| |
| | |
tool for the test build
|
| |
| |
| |
| |
| | |
Most users will want this, the only downside is some SLPlugin
instances idling in the background.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them.
And looks like they left crap laying around from the old method.
Removed the crap.
Updated the values the slider uses to better suit modern equipment, while leaving the low end the same.
Pumped up "linden" tree rendering, it was way too low.
|
| | |
|
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
that I have reconsidered, fix up some actual problems.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|