Siana Gearz
188e42ee4a
Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup
2013-01-13 20:10:25 +01:00
Aleric Inglewood
f606477ae5
Use "mesh" as context everywhere (for loading and saving).
2013-01-13 19:48:35 +01:00
Aleric Inglewood
5250b218c5
LLPanelProfile is not a floater: onOpen is not virtual.
2013-01-13 19:47:32 +01:00
Aleric Inglewood
909247a179
Keep decimal format the default.
2013-01-13 19:46:35 +01:00
Aleric Inglewood
e7dea2714e
Merge branch 'master' into meshupload
2013-01-13 18:02:28 +01:00
Aleric Inglewood
dcc2e52c61
Merge remote-tracking branch 'singu/master'
2013-01-13 18:01:48 +01:00
Aleric Inglewood
db17b93156
Merge branch 'master' into meshupload
...
Conflicts:
indra/newview/llmeshrepository.cpp
Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.
2013-01-13 17:59:49 +01:00
Siana Gearz
5b0597ea47
Suppress 400 GCC warnings in Collada DOM headers
2013-01-13 06:27:02 +01:00
Siana Gearz
5f3ca7fda0
Linux64 support, integrated physics/decomposition
2013-01-13 03:23:56 +01:00
Aleric Inglewood
e01567553e
Added default message for feed uploads.
...
By default show 'Type your message here...' and if the text editor
never got focus, replace that with a default message.
2013-01-12 21:31:21 +01:00
Aleric Inglewood
bf7b0bf4bf
Hide floater until success/failure (or floater is re-opened)
2013-01-12 21:16:40 +01:00
Aleric Inglewood
2da5c51e42
Do not freeze UI when snapshot floater is opened the first time.
2013-01-12 17:35:01 +01:00
Aleric Inglewood
57228fa208
Fix upload snapshot to inventory callback mechanism.
2013-01-12 17:27:33 +01:00
Siana Gearz
85855ecd85
Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshup
2013-01-12 01:12:33 +01:00
Siana Gearz
cbfd31a576
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer into meshup
2013-01-12 01:11:01 +01: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
a47dbf88bb
Fix Issue 590: Debug Settings parameters setting is seriously bugged
2013-01-11 15:50:47 -05:00
Lirusaito
2dda9499fa
Unhide Client column properly on non-SL Grids.
2013-01-11 03:56:55 -05:00
Aleric Inglewood
f9738cb611
Add getName() to every non-base class Responder object.
2013-01-11 04:15:55 +01:00
Aleric Inglewood
5daf817e7e
Upload larger original to profile feed.
2013-01-10 19:42:19 +01:00
Aleric Inglewood
9175bc0e16
Fixed LLUploadDialog to display it's text.
...
Also made the view rectangle have some minimal size (1/10th of the
screens width and height).
Increased the used font a bit.
Fixed removal of the dialog in the case of uploading to profile feed.
2013-01-10 18:48:02 +01:00
Lirusaito
b7f1fdd9cc
Vertical space recovered
2013-01-09 11:25:46 -05:00
Lirusaito
07f88d21bd
Applied STORM-1209 and added string AGroupMemberNamed for translation.
2013-01-09 11:05:37 -05: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
c96b840c53
Split off certain preferences into new Adv. Chat subtab Chat UI
...
From Text Chat: Disallow communicate shortcut opening detached friends list
From Vanity: Use horizontal buttons for contacts floater (needs restart)
The rest were in Chat/IM of Vanity.
2013-01-09 07:30:49 -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
Aleric Inglewood
136e6dd389
New debug channel dc::snapshot.
2013-01-09 00:54:53 +01: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
Siana Gearz
54a53b574f
Follow fix and clean-up
2013-01-09 00:07:17 +01:00
Lirusaito
b485048f6b
Show local chat bar in floater... (Needs restart)
2013-01-08 17:17:52 -05:00
Lirusaito
3ed2da9282
Once more change the behavior of minimizing new chats in open in separate floater mode, to be a little more truthful.
2013-01-08 14:53:08 -05:00
Drake Arconis
7aa95debf1
Merge branch 'master' into meshupload
2013-01-08 14:37:54 -05:00
Drake Arconis
f178de2ff8
Merge remote-tracking branch 'Lirusaito/master'
2013-01-08 14:37:45 -05:00
Drake Arconis
2d9402fd2d
Merge branch 'master' into meshupload
2013-01-08 14:37:25 -05: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
Drake Arconis
10c19731b3
Merge remote-tracking branch 'Aleric/master'
2013-01-08 13:11:43 -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
b4b6186f54
Re: 3ea353bef3, fix minimize case to minimize and not steal focus. Also apply to group chats.
2013-01-08 08:43:55 -05:00
Drake Arconis
8889f6b837
Merge remote-tracking branch 'Lirusaito/master'
2013-01-08 06:38:08 -05:00
Lirusaito
3ea353bef3
Change default behavior of separated non-local chats mode to open minimized.
2013-01-08 06:33:07 -05:00
Drake Arconis
ca746f3b47
Merge remote-tracking branch 'Lirusaito/master' into altcompilers
2013-01-08 06:17:47 -05:00
Drake Arconis
0ce91ce5ed
Build fixes
2013-01-07 18:44:51 -05:00
Lirusaito
67e4518132
Scroll to the object's texture if the user has a copy in their inventory. EXT-5403? Fixes part of Issue 501.
2013-01-07 18:32:54 -05:00
Lirusaito
0636f0049a
Rectify the problem in which profile images would be below the window border when first opened.
2013-01-07 18:20:02 -05:00
Lirusaito
1b2c0ba02b
v-d llviewermenufile.cpp functions (and order) for meshupload, decide when Upload Mesh entry should be enabled.
2013-01-07 18:08:42 -05:00
Aleric Inglewood
cbbe678f9e
Remove FloaterModelPreviewRect
2013-01-07 23:31:40 +01:00
Aleric Inglewood
5efcc7186e
Fixed mesh file picker and then some
2013-01-07 23:12:09 +01:00
Aleric Inglewood
d188ecae70
Fix crash because of missing debug setting
2013-01-07 23:01:10 +01:00