| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same.
Conflicts:
.gitignore
linden/indra/develop.py
linden/indra/llcommon/llsdserialize_xml.cpp
linden/indra/newview/CMakeLists.txt
Manually combined MOAP, OTR, and WL changes from both.
linden/indra/newview/app_settings/default_grids.xml
Manually merged the grid collection.
Also updated IG info.
linden/indra/newview/hippoupdate.cpp
linden/indra/newview/llettherebelight.cpp
Just used the Imprudence copy.
linden/indra/newview/llviewermessage.cpp
Keep unbranding.
linden/indra/newview/llvoavatar.cpp
Manually merge client tags.
linden/indra/newview/res/viewerRes.rc
Manually merge version from Impy.
linden/indra/newview/skins/dark/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/default/html/unabletoconnect.png
linden/indra/newview/skins/default/textures/icon_top_pick.tga
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
Manual merging of contributors.
linden/indra/newview/skins/gemini/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
linden/indra/newview/viewer_manifest.py
Manually merged boost, gstreamer, OTR, and name.
linden/indra/newview/viewerinfo.cpp
Manually merge the comment.
|
| |
| |
| |
| | |
left over cruft.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
translations by Ben and Daniel."
This mostly reverts commit 0cc783a5043dc65b763efb2f5b91058cc75823d5.
Conflicts:
linden/indra/newview/skins/default/xui/da/menu_viewer.xml
linden/indra/newview/skins/default/xui/de/menu_viewer.xml
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
linden/indra/newview/skins/default/xui/es/menu_viewer.xml
linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
linden/indra/newview/skins/default/xui/it/menu_viewer.xml
linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts (for future reference):
linden/indra/llcommon/llstring.cpp
linden/indra/newview/llpanelnetwork.cpp
linden/indra/newview/llselectmgr.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/lltoolmgr.cpp
linden/indra/newview/llvoavatar.cpp
|
| | |
|
| |
| |
| |
| | |
Click menus are transparent on the login screen and #534: Right click menus aren't translatable
|
| |
| |
| |
| |
| |
| | |
the text shown during group creation.
Languages other than English where just guessed at crudely.
|
| | |
|
| |
| |
| |
| | |
and Daniel.
|
| | |
|
|/
|
|
|
|
| |
that sort of policy should be server side anyway.
It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over.
|
|
|
|
| |
See http://redmine.imprudenceviewer.org/issues/577
|
|
|
|
| |
showing the wrong profile (#514)
|
|
|
|
| |
applicable
|
|
|
|
| |
hour/24 hour/UTC. Side effects: moved crash logger settings to advanced prefs, fixed french date translations, past/future dates and times still need to be correctly formatted
|
| |
|
|
|
|
| |
classified panel buttons are still a bit off in some languages)
|
| |
|
|
|
|
|
|
| |
Changed "Second Life" to "Imprudence", etc.
Some URLs and SL-specific things have not been rebranded.
Added foundation for dynamically rebranding grid names later.
|
|\
| |
| |
| |
| | |
Custom message in Pay Resident floater, and XUI cleanup.
(SNOW-436, formerly VWR-9597)
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
|
|