Commit Graph

4061 Commits

Author SHA1 Message Date
Drake Arconis
425db80fea Fix warning on non-windows platforms about unknown pragma 2013-03-04 03:31:44 -05:00
Drake Arconis
43c0c4ce91 Some CMake Cleanup
Clean up leftover SERVER and VIEWER from when they were a single tree
Fixed debian multiarch cmake
Small bits of OSX cleanup
2013-03-04 03:31:24 -05:00
Lirusaito
79f6883bdf [Issue 662] Translations retouch
Fixes overlaps and text running out of boundaries.
2013-03-03 14:48:03 -05:00
Lirusaito
3effb23f08 Call LLTrans::parseStrings before setting up notifications during LLAppViewer::init
Fixes the issue with notifications not translating

Moves the UI initialization code block up a few lines to the same area as v-d and sunshine-external have it.
This more clearly shows how it relates with upstream code such that future changes in this area might avoid similar issues.
2013-03-03 11:42:38 -05:00
Lirusaito
9ffa700c97 xmllint fixups 2013-03-03 09:58:02 -05:00
Lirusaito
198ef8feb0 Fix French role_actions.xml parsing warning 2013-03-02 22:20:42 -05:00
Lirusaito
fcd343af69 Small touches
Missed a line during Issue 662
Correct order of contributors to be alphabetical
Present existing translations before others.
2013-03-02 19:25:47 -05:00
Lirusaito
11856180aa [Issue 662] Translations from upstream to ease the resulting load on translators. 2013-03-02 14:32:26 -05:00
Lirusaito
4060db34fa [Issue 662] The text replacing certain heading texts to be as wide as it needs to be 2013-03-01 19:53:29 -05:00
Lirusaito
ab21a74bfc [Issue 662] Plug in LLPanelEstateInfo::updateEstate* functions 2013-03-01 19:31:18 -05:00
Lirusaito
bbe81a86f5 [Issue 662] Allow Version text on Region/Estate region tab to be as long as it needs to be 2013-03-01 15:36:24 -05:00
Lirusaito
1c0f222028 [Issue 662] Add Environment tab to Region/Estate Floater. 2013-03-01 15:23:44 -05:00
Lirusaito
cfd24e0f09 [Issue 662] Switch to using LLEstateInfoModel
Applies part of STORM-1506 patch from https://codereview.secondlife.com/r/397/
Removes old WindLight parts from code.
2013-03-01 11:23:43 -05:00
Lirusaito
c2c9d53000 [Issue 662] In preparation for Environment panel, sync panel_region_estate.xml 2013-02-28 23:38:49 -05:00
Lirusaito
8eff717612 [Issue 662] STORM-1265: Combine Terrain and Ground Textures tabs in Region/Estate floater 2013-02-28 23:37:23 -05:00
Lirusaito
c509378b24 [Issue 662] Make the Region/Estate's Covenant panel's text editor take up as much space as the LL Viewer's. 2013-02-28 19:44:29 -05:00
Lirusaito
df8595b72e [Issue 662] Update llfloaterregioninfo.* in preparation for adding new functionality. 2013-02-28 15:04:05 -05:00
Lirusaito
6525ccc384 Group Feature Request/Bug Fix: Allow setting a log location for any account before log in
The new setting gets overridden by the per account setting, if it has been set, but provides users the ability to set log location pre-login.
2013-02-28 14:41:08 -05:00
Lirusaito
7617f560ab Fix up a mistake in antispam logic where only the user, not any other residents might be blocked.
Adds can_block() to NACLantispam.cpp to unify the blocking checks, so mistakes like this shouldn't happen again.
Best viewed without space changes.
2013-02-28 14:05:01 -05:00
Lirusaito
4990af9cfd Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon 2013-02-27 15:47:03 -05:00
Lirusaito
09c8be1673 Workaround the chat bar no longer focusing because it is within a layout_stack 2013-02-27 15:35:38 -05:00
Aleric Inglewood
186c3ef88a Add support for xdg-open. 2013-02-27 17:22:10 +01:00
Latif Khalifa
ad03c27805 Tell cmake to only search paths we tell it to 2013-02-27 00:49:51 +01:00
Siana Gearz
c9ab38d449 Stream frequency change support and new anti-starvation strategy 2013-02-26 23:13:39 +01:00
Lirusaito
cef61db77f Feature Request: Add debug setting for showing Position Before Parcel in the Status Bar
Adds StatusBarPositionBeforeParcel
Enables builders on parcels with keywords in their names to see their position.
2013-02-26 16:59:35 -05:00
Lirusaito
c0c32c4b70 Minimal update of llpanelgrouproles.cpp to get the owner role checkbox to enable properly. 2013-02-26 16:56:59 -05:00
Lirusaito
620849607e Fulfill feature request: Optionally, don't ShowDisplayNameChanges in notifications.
Show display name changes checkbox added to Adv. Chat->Chat/IM tab.
Better viewed without space changes.
2013-02-26 16:35:02 -05:00
Lirusaito
180d1862a8 Dim seconds text in general preferences when AllowIdleAFK is false. 2013-02-26 16:07:21 -05:00
Siana Gearz
6ee8cc5798 Unbreak skinning on low end hardware 2013-02-26 20:47:43 +01:00
Siana Gearz
f3b7102034 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-02-26 00:23:35 +01:00
Siana Gearz
13e0bc2742 Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/lldrawable.cpp
	indra/newview/llviewerwindow.cpp
2013-02-26 00:20:26 +01:00
Siana Gearz
a4b49e3fc2 Random stab at object updates. Tell me if it breaks anything. 2013-02-26 00:00:45 +01:00
Siana Gearz
e2659b801a Dirty fix object import 2013-02-25 23:58:43 +01:00
Lirusaito
c3e63e7ab7 handleLocalChatBar visibility whenever ShowLocalChatFloaterBar changes value 2013-02-25 17:39:53 -05:00
Shyotl
d27b329afb Minor bit of cleanup. Also now using glTexGenf instead of glTexGeni for fixed-function water texcoords. 2013-02-25 13:02:22 -06:00
Shyotl
e187e642c0 Restored some RLVa shownames logic that was clobbered a while ago. 2013-02-25 13:00:07 -06:00
Shyotl
fd21197d2a Wedged high-res non-tiled deferred snapshot logic into LLViewerWindow::rawRawSnapshot 2013-02-25 12:59:17 -06:00
Shyotl
34cf0329ab Crahfix for avatars, as destruction can be delayed via llpointer refs, meaning the region the av was in could be long gone before the avs destructor is actually called. Calling logPendingPhases in a more reasonable place (markDead). 2013-02-25 12:55:50 -06:00
Shyotl
94a0040ddb Sunshine catchup. 2013-02-25 12:53:18 -06:00
Lirusaito
9d6d8da54d Missed a spot in last commit. 2013-02-24 16:50:11 -05:00
Lirusaito
8e08e98c61 Only don't ShowLocalChatFloaterBar when Local Chat is torn-off. (Setting no longer requires relog) 2013-02-24 15:23:52 -05:00
Melanie
3036f74b69 Send the currently selected object list in the custom menu options request so that options can be created that operate on items. 2013-02-24 11:03:14 -05:00
Lirusaito
2ad9476961 Support SimulatorFeature MarketplaceURL for Marketplace Search tab on non-SL grids. 2013-02-24 10:54:46 -05:00
Aleric Inglewood
13e032fb04 Make AICurlThread::wakeup_thread thread-safe. 2013-02-23 23:29:43 +01:00
Aleric Inglewood
803e92020b Renamed AICurlThread::mWakeUpMutex --> AICurlThread::mWakeUpFlagMutex 2013-02-23 23:23:48 +01:00
Aleric Inglewood
b6cbed838f Assertion bug fix for libcwd with dc::curl on and curlio off. 2013-02-23 21:37:07 +01:00
Aleric Inglewood
19314b6686 Removed two unnecessary states from AICurlEasyRequestStateMachine
Removed AICurlEasyRequestStateMachine_added and
AICurlEasyRequestStateMachine_finished because the state machine is not
taking any action there anyway, and those states might be skipped all
together even, so they make no sense / shouldn't exist.
2013-02-23 21:33:37 +01:00
Aleric Inglewood
5d329d9e55 Fix initialization list order.
Also fixes a Dout line and initializes mState to 0 so
that if ever set_state would be called first from
a non-main thread then it will be larger (probably
not needed currently).
2013-02-23 21:13:26 +01:00
Aleric Inglewood
4851cc174e Revert "Work in progress"
This reverts commit ef35aa7954
because it contained too much wrong things that I won't be
using. I'll re-commit stuff from it after that that I do
want to keep.
2013-02-23 20:00:13 +01:00
Aleric Inglewood
78bb94eb42 Bug fix: remove remainder of test code 2013-02-23 19:36:18 +01:00