callum_linden
51ed4c977a
Update to build on Xcode 6.0: remove lots of unused variables
2014-10-18 12:14:33 -07:00
Callum Prentice
edec2d0559
Merge with viewer-release
2014-07-15 10:15:15 -07:00
Callum Prentice
fbe10b8ee0
Merge with viewer-release
2014-05-07 09:31:20 -07:00
Oz Linden
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
callum_linden
ef095034d1
MAINT-3880 FIX Show favorite landmarks on login screen checkbox, is checked in preferences after being unchecked
2014-03-28 15:36:50 -07:00
Richard Linden
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
Oz Linden
0f3ba54a7e
merge changes for 3.7.3-release
2014-03-10 15:47:27 -04:00
maksymsproductengine
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Jonathan Yap
c804c6b69e
STORM-68 Remove Apply button
...
Add menu entry to Build->Options->Set Default Permissions...
Disable Preferences->Advanced->Default Creation Permissions button when on login screen
Add code for a one-time conversion from the old upload settings
XML cleanup
2013-12-12 14:11:28 -05:00
Oz Linden
0031e9a97b
merge up to 3.6.10-release; some of the storm-68 changes lost
2013-11-19 17:59:55 -05:00
Richard Linden
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
Mnikolenko ProductEngine
aaf6c7954d
MAINT-3374 FIXED Don't show username after display name if this setting is disabled.
2013-11-06 11:42:48 +02:00
Richard Linden
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
Oz Linden
4dccf30bf3
merge changes for 3.6.7-release
2013-10-03 18:04:27 -04:00
Richard Linden
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
Oz Linden
d53f9366d0
merge changes for storm-1888
2013-09-09 16:04:45 -04:00
simon
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Cinder Roxley
97ed20a12b
Merged lindenlab/viewer-release into default
2013-06-27 21:31:48 -06:00
Dave Parks
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
Merov Linden
b3c010ea71
Pull merge lindenlab/viewer-release
2013-06-19 12:24:44 -07:00
Cinders
4cf16ffdfb
STORM-1888: Hide Spellchecker Settings floater when Preferences floater is closed
...
Bonus: Correct the immediately preceding auto replace comment
2013-05-22 21:43:32 -06:00
PavelK ProductEngine
3187ee18e1
CHUI-945 FIXED Add Object IMs to Chat Notification Preferences
2013-05-15 20:31:47 +03:00
Graham Madarasz
0f3cbfafcb
NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loaded successfully
2013-05-09 14:01:31 -07:00
Graham Madarasz (Graham)
9187a06d0b
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
2013-05-03 09:16:15 -07:00
simon
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
callum_linden
1d3f018e81
MAINT-2417 FIX Update Graphics tab layout
2013-04-09 17:04:57 -07:00
AlexanderP ProductEngine
3b51f73b7c
CHUI-799 FIXED Notification is not given to user when they select only friends and groups can IM me preference
2013-03-28 19:06:39 +02:00
Merov Linden
d37b3ca62e
CHUI-839 : Fixed! Make the LLLineEditor in chat preferences read-only but selectable
2013-03-13 13:40:26 -07:00
Gilbert Gonzales
6b067125a0
CHUI-778: Adjusted text in prompts for deleting chat log and chat transcripts (per UX).
2013-03-11 14:49:24 -07:00
Gilbert Gonzales
9f965be297
CHUI-778: Now when changing paths for chat logs and transcripts any empty conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded.
2013-03-04 10:11:51 -08:00
Gilbert Gonzales
e5d6b29260
merge
2013-02-25 12:57:39 -08:00
Gilbert Gonzales
c70a951abd
CHUI-778: Pushing a quick fix that only pertains to CHUI-778 so we can close out this issue.
2013-02-25 11:41:22 -08:00
Gilbert Gonzales
05f4e8a105
CHUI-778 (Saving preferences updates text in all open message panels in conversation floater to show as old messages) Now changing the log/transcripts file location actually moves the files to the new location. Prior behavior just started a new history at that location. Also a fix was made so that if the user changed the log/transcripts path then after pressing the Preferences 'OK' button the new location will be saved to the corresponding .xml file.
2013-02-22 18:53:40 -08:00
Gilbert Gonzales
10dfe2d534
CHUI-778: Minor changes, prior commit was not changing the file path correctly due to logic error. Also clicking the 'Cancel' in preferences would still cause the file location to be saved instead of ignore the save.
2013-02-20 15:51:44 -08:00
Gilbert Gonzales
61c1b2fe2b
CHUI-778 (Saving preferences updates text in all open message panels in conversation floater to show as old messages) Problem was that closing the preferences floater was always acting as if the conversation transcripts/log files path had changed. If the path did not change then the user's conversations would be cleared and re-loaded as if they were part of the user's history (causing text to be grey). Solution: Now keep track of when the path was changed and only load up the transcripts/log upon change.
2013-02-19 16:38:22 -08:00
Mnikolenko ProductEngine
e4ea94b622
CHUI-779 FIXED Chat log preferences are disabled before login.
2013-02-18 18:56:22 +02:00
Mnikolenko ProductEngine
fdd55c279e
CHUI-742 FIXED Do not update Log locations immediately after selecting a new location.
2013-02-18 14:59:03 +02:00
Mnikolenko ProductEngine
8aaedd0a5f
CHUI-742 FIXED Update log location when closing Preference floater.
2013-02-12 14:27:52 +02:00
maksymsproductengine
ec0ac12eba
CHUI-712 FIXED IM log files renamed with ll.txt will create double files for users
2013-02-06 20:51:14 +02:00
Mnikolenko ProductEngine
2f6ffe2183
CHUI-721 FIXED Delete transcripts when performing Clear log action.
2013-02-04 14:37:29 +02:00
maksymsproductengine
2ac99f55f9
CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tab
2013-01-24 19:56:13 +02:00
Merov Linden
12554bffb3
CHUI-580 : Fixed : Avoid fetching names while reacting to display name checkbox change (overkill), make display name pref disabled when usePeopleAPI is off
2013-01-04 20:23:14 -08:00
William Todd Stinson
78b7a4b37c
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-12-12 12:48:59 -08:00
Dave Parks
72cbe5b942
MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled.
...
Reviewed by VoidPointer
2012-11-26 17:10:22 -06:00
maxim_productengine
a4a6e5a17d
CHUI-523 Additional fix
2012-11-21 15:26:56 +02:00
maxim_productengine
e52c0218c7
CHUI-523 FIXED Set visibility of warning message depending on combobox state.
2012-11-20 18:40:53 +02:00
maksymsproductengine
7a088e9b2c
CHUI-501 FIXED Add link to Privacy tab from Comms floater
2012-11-14 19:39:50 +02:00
AlexanderP ProductEngine
486bdf3284
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
...
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00