Aleric Inglewood
e3f4022ffa
Merge remote-tracking branch 'singu/master'
...
Conflicts:
indra/newview/llvoavatar.cpp
Bug fix is no longer needed.
2013-03-07 16:53:15 +01:00
Aleric Inglewood
65d750b190
Add CPU cycles to AIStateMachine in the crashlogger
...
Also removes unused Debug Setting CurlMaximumNumberOfHandles.
The maximum number of handles is limitted by
CurlMaxTotalConcurrentConnections.
2013-03-07 13:44:40 +01:00
Siana Gearz
c9ab38d449
Stream frequency change support and new anti-starvation strategy
2013-02-26 23:13:39 +01:00
Siana Gearz
6ee8cc5798
Unbreak skinning on low end hardware
2013-02-26 20:47:43 +01:00
Siana Gearz
408811c319
Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
2013-02-20 21:20:22 +01:00
Shyotl
8d09539fcc
Added a couple missing entries to settings.xml
2013-02-19 21:52:13 -06:00
Siana Gearz
00cb7a0e51
Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
2013-02-19 21:12:14 +01:00
Shyotl
76f3dc9e19
Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback.
2013-02-19 01:50:46 -06:00
Lirusaito
3c544bceb3
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon
2013-02-17 19:47:48 -05:00
Siana Gearz
6123c9b80a
Enable broadcast viewer effects by default
2013-02-17 16:00:59 +01:00
Siana Gearz
dbdd0ec4f1
Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer
2013-02-17 15:40:27 +01:00
Siana Gearz
0f54a2777e
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2013-02-17 15:36:59 +01:00
Siana Gearz
49c872c86d
Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer
2013-02-17 15:28:48 +01:00
Shyotl
4cc35d6c66
Fixed up some silly issues with the client tag system.
2013-02-17 02:54:30 -06:00
Lirusaito
cd6bda876d
Add RememberName setting to settings.xml (No wonder it wasn't saving!)
2013-02-15 08:28:54 -05:00
Aleric Inglewood
b40e8fb508
Add checkbox "Keep aspect ratio" to snapshot floater.
2013-02-12 22:21:39 +01:00
Shyotl
0742610674
Updated gObjectPreviewProgram shader (simple lighting)
2013-02-12 14:59:02 -06:00
Lirusaito
f95830fe23
Extend fuctionality of non-SL capability
2013-02-11 19:12:17 -05:00
Lirusaito
1d4858ae85
Add support for two non-SL grid features/flags.
...
Adds support for GamingData cap, and flags: PF_GAMING, DFQ_FILTER_GAMING, REGION_FLAGS_GAMING, and REGION_FLAGS_HIDE_FROM_SEARCH
Adds GamingCheck to floater_about_land.xml
Adds filter_gaming checkboxes to floater_directory* xmls
Adds "is gaming" and "hide from search" checkboxes to floater_god_tools.xml
2013-02-11 01:14:09 -05:00
Lirusaito
cff7a2a464
Brought in Script Limits from v-d! (Accessible from About Land)
2013-02-11 01:12:21 -05:00
Latif Khalifa
78dbaf2ed1
Moved RLVa menu back to advanced by default
2013-02-04 00:47:19 +01:00
Siana Gearz
dc3f91b121
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-02-03 22:27:53 +01:00
Siana Gearz
2b036c7334
Split out HTTP texture bandwidth
2013-02-03 22:18:34 +01:00
Lirusaito
0a6bebf9db
Added ShowSimChannel debug setting to display sim channel information in the status bar.
2013-01-31 22:22:40 -05:00
Latif Khalifa
4b0bac34dd
Added the ability to have the voice enabled in multiple viewer instances
2013-01-31 01:26:39 +01:00
Lirusaito
e009b8f4b4
Added simple codeless floaters for My Outfits and Favorites folders, entries are in World menu.
2013-01-30 14:11:22 -05:00
Latif Khalifa
8584e6da4c
Merge branch 'master' into meshupload
...
Conflicts:
indra/llcommon/llhash.h
indra/newview/CMakeLists.txt
indra/newview/llfloatermodelpreview.cpp
indra/newview/llfloatermodelpreview.h
indra/newview/llpanelprofile.h
2013-01-30 00:36:31 +01:00
Aleric Inglewood
b3adf71ed7
Remember floater rectangle
2013-01-29 23:20:02 +01:00
Latif Khalifa
d8c846288e
Merge remote-tracking branch 'lirusato/master'
2013-01-22 20:06:03 +01:00
Lirusaito
21860ded90
Support web_profile_url response from OSGrid servers for setting WebProfileURL
2013-01-21 21:27:53 -05:00
Latif Khalifa
18816ae146
Merge remote-tracking branch 'shyotl/sunshine'
2013-01-21 11:25:10 +01:00
Siana Gearz
d5eb2432ef
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-20 01:49:14 +01:00
Latif Khalifa
460b05d37a
Merge remote-tracking branch 'shyotl/master'
2013-01-16 16:25:51 +01:00
Shyotl
6894d4c0bc
Changed how the 'client' column in avatar radar is handled. Initially was not designed nor tested to be toggleable on user-demand (was one shot deal depending on detected grid).
2013-01-15 23:14:58 -06:00
Latif Khalifa
8cec9c7b73
Merge remote-tracking branch 'lirusato/master'
2013-01-15 18:36:39 +01:00
Lirusaito
0494dc8d32
Fix Issue 432: Radar Keeps Popping Up and side issue I got still the window "An object owned by you ..."
...
Unified key message sending to function send_keys_message()
Switched a few getBOOLs to CachedControls
Added RadarChatKeysStopAsking, and RadarChatKeysRequest as a three button notification so the user can decide to permanently say no.
Corrected RadarChatKeys description to be more accurate.
If we want to know if the radar is open, we check instanceExists, not getInstance.
Also enabled using the announce button when RadarChatKeys is false to announce keys, for manual updates.
2013-01-14 06:34:27 -05:00
Siana Gearz
cddd21d879
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-13 20:11:15 +01:00
Latif Khalifa
cef7ea9f5e
Merge remote-tracking branch 'lirusato/master' into 1.7.3-dev
2013-01-13 12:45:37 +01:00
Shyotl
e622e03d2a
Bulk of server-baking impelmentation and a bit of cleanup.
2013-01-13 02:37:12 -06:00
Lirusaito
ece92a1b7c
Optionally, have group chat and conference buttons on title line.
...
Adds UseConciseGroupChatButtons, and UseConciseConferenceButtons
Adds "Buttons on group chat name line (Affects new group chats)" and "Buttons on conference title line (Affects new conferences)" checkboxes to Adv. Chat's Chat UI tab.
Adds floater_instant_message_ad_hoc_concisebuttons.xml, floater_instant_message_group_concisebuttons.xml
Brings panel_speaker_controls.xml's speakers_list down by 7 pixels, which is necessary because it is awkwardly high in old places as well, such as Local Chat.
2013-01-12 14:42:55 -05:00
Siana Gearz
b6f1bb570f
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-01-12 00:59:06 +01:00
Siana Gearz
896036b3c2
Removing ReSit, because it's not so very nice
2013-01-12 00:50:24 +01:00
Lirusaito
a7d1a4611f
Optionally, have IM buttons on the same line as the person's name.
...
Adds UseConciseIMButtons.
Adds floater_instant_message_concisebuttons.xml
Adds Have buttons on the same line as name for IMs (Affects new IMs) checkbox to Adv. Chat's Chat UI tab.
2013-01-09 10:19:41 -05:00
Lirusaito
70445ab8a3
Add option for Horizontal buttons on Contacts floater.
...
Adds Use horizontal buttons for contacts floater (needs restart) to Vanity Preferences.
Adds ContactsUseHorizontalButtons.
Adds FloaterContactsHorizRect for saving horizontal contacts rect.
Adds panel_friends_horiz.xml, panel_group_horiz.xml, and floater_my_friends_horiz.xml
Also corrects string value for FloaterContactsRect
2013-01-08 20:21:15 -05:00
Siana Gearz
94edef2c3f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-01-09 00:07:57 +01:00
Siana Gearz
1434e8d6e9
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-01-09 00:07:34 +01:00
Lirusaito
68911876b9
Option to Disallow communicate shortcut opening detached friends list
...
Added CommunicateSpecificShortcut
Added checkbox to Text Chat preferences
2013-01-08 13:48:18 -05:00
Lirusaito
820b4ea358
Optionally, remove chatbar from local chat floater.
...
FloaterChatBarlessRect keeps the size of this separate, for those who want to switch by mood.
ShowLocalChatFloaterBar toggles this.
Show local chat bar in floater entry added to Adv. Chat prefs.
floater_chat_history_barless.xml added for this.
2013-01-08 12:16:51 -05:00
Lirusaito
3ea353bef3
Change default behavior of separated non-local chats mode to open minimized.
2013-01-08 06:33:07 -05:00
Aleric Inglewood
4b592f7507
Merge remote-tracking branch 'singu/master'
2013-01-07 17:58:53 +01:00