| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Windows is being a pig, will take a while.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
http://redmine.kokuaviewer.org/issues/948
The new hot keys are -
Ctrl-Shift-P for position (Ctrl-Alt-P was taken).
Ctrl-Alt-F for face selection.
Ctrl-Alt-M for align, and Ctrl-Alt-Shift-M for pack.
Also fixed things so they all work all the time, and refactored common code.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
http://redmine.kokuaviewer.org/issues/867
Also removed forums and blog links, since they are part of the comms channels page,
but added bug reporting link.
|
| |
| |
| |
| |
| |
| | |
http://redmine.kokuaviewer.org/issues/606
Also added the other "Show x" from the Tools menu, and sorted that part of the menu into alphabetical order.
|
| |
| |
| |
| |
| |
| |
| |
| | |
http://redmine.kokuaviewer.org/issues/961
Instead of copying something, then trying to delete the original,
which was happening before the copy hit the sim server,
just move it to a different folder like drag and drop does.
|
| | |
|
| | |
|
| |
| |
| |
| | |
It was missing any, and ended up with text from the last tool selected.
|
| |
| |
| |
| | |
Advanced Menu > Rendering > Info Display
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
discussed on IRC and the mailing list, and remove some SL logos.
I know, there are two slightly different LICENSE-logos.txt files.
One that was originally in the source repo, one that was from the artwork package.
I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
|
| |
| |
| |
| | |
left over cruft.
|
| |
| |
| |
| | |
I similar fix should be applied to Gemini and Dark, but that should wait for the decision to move artwork into the repo.
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
I think this is right.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts (merged manually):
.gitignore
linden/indra/newview/llgesturemgr.cpp
linden/indra/newview/viewerinfo.cpp
|
| | |
|
| | |
|
| |
| |
| |
| | |
in French
|
| | |
|
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
The UI for selecting dictionaries needs a fundamental revamp, but
this clarification should at least reduce some user confusion.
|
| |
| |
| |
| |
| | |
That checkbox was removed from Preferences > Colors in the previous
commit (87219855).
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| | |
The choice of grid affects the name and password fields, so the grid
selector should be on the left, so that users will interact with it
first. If it were on the right, users would often interact with it
*after* typing in their name and password, which would cause the name
and password fields to be reset, frustrating the user.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|