Commit Graph

3765 Commits

Author SHA1 Message Date
Shyotl
5180fbfc23 Clean up llfloaterurlentry 2013-02-12 14:50:29 -06:00
Shyotl
0759f2dae8 Actually use the namecache callback results when displaying currency transaction notifications. 2013-02-12 14:47:59 -06:00
Shyotl
c799f9f7eb Avoid sculpt discard-level 5 spam. 2013-02-12 14:46:31 -06:00
Siana Gearz
dc3f91b121 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-02-03 22:27:53 +01:00
Siana Gearz
064601ae5e Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-02-03 22:18:44 +01:00
Siana Gearz
2b036c7334 Split out HTTP texture bandwidth 2013-02-03 22:18:34 +01:00
Siana Gearz
6a774e4685 This should fix voice decline crash 2013-02-03 21:56:13 +01:00
Aleric Inglewood
83fb898852 Bug fix: Wake up curl thread at exit of viewer. 2013-02-03 17:24:26 +01:00
Siana Gearz
57d43786ab Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer 2013-02-02 02:22:46 +01:00
Shyotl
1069d5dec4 Draw trees before sky. Z-cull may be beneficial. Also, was incorrectly setting alphawrite off for deferred wlsky pass. 2013-02-01 17:16:01 -06:00
Aleric Inglewood
d055494706 Libcwd compile fixes
include linden_common.h first (is already included through the used
headers).
2013-02-01 21:26:08 +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
Lirusaito
5b2e1a0aae Remove remaining dead LCD code(, also fix typo in a comment) 2013-01-31 21:32:29 -05:00
Lirusaito
46ddc9b6be Skins Request: Nano Green and Nano Purple 2013-01-31 21:18:50 -05:00
Latif Khalifa
5cbe633117 Fixed compile under older GCCs by Siana Gearz 2013-02-01 00:18:01 +01:00
Latif Khalifa
719ea47a35 Merge remote-tracking branch 'lirusato/Canon' 2013-01-31 17:21:08 +01:00
Latif Khalifa
70eeddabba Merge remote-tracking branch 'shyotl/sunshine' 2013-01-31 17:20:58 +01:00
Lirusaito
d756225684 Minimal change to fix folder->Add Items, purgeCategory wasn't supposed to be called in this case. 2013-01-31 02:41:17 -05:00
Shyotl
26de17f2de Avoid occasional DoF-related crash upon region disconnection. 2013-01-30 22:04:57 -06:00
Shyotl
be0d751334 Cleanup, further hardening of namecache callbacks, and update to avatar picker. 2013-01-30 22:04:04 -06: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
bf8bd9cb1a Further notifications.xml touchup. 2013-01-30 19:16:56 -05: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
Lirusaito
47cbaeed23 XML-Driven floater feature (and documentation)
Changes:
Adds LLUICtrlFactory::getBuiltFloater() to return LLFloater* when a floater has been built.
In llviewermenu.cpp's LLShowFloater::handleEvent():
Return early if the floater_name is empty,
otherwise if no anticipated floater is found, build one,
unless one of the same name is already built, then bring it to focus.



Documentation:
In order to add simple codeless floaters, a general understanding of our XMLs is necessary...
A simple codeless floater can be a few things, perhaps not limited to: media browsers, settings controls, and holders for inventory_panels.

So how do you make them conform to the codeless standard?
For the purpose of these examples, my floater file will always be floater_name.xml
Let's start with a shortened xml menu entry:
<menu_item_call label="Name!" name="name">
  <on_click function="ShowFloater" userdata="floater_name.xml"/>
</menu_item_call>
Alright, that wasn't so hard, just remember the key in this is ShowFloater is the function and userdata is the filename.

The next part is the actual floater, which isn't so different from making a complex floater..
There are two ways to do this, depending upon desired behavior:

The first behavior is to have only one of the floater open at a time, the following short xml exemplifies this:
<floater name="floater_name.xml" title="Name!"/>
Having a floater with this behavior will cause the menu entry to bring it into focus.

The other behavior is to allow more than one of the floater open at a time:
<floater name="name" title="Name!"/>
In this case, the menu entry will spawn a new version of the floater with every click, regardless of previous ones existing.

Granted, these short <floater/>'s probably aren't but examples and will not likely stand alone.
2013-01-30 14:07:59 -05:00
Latif Khalifa
4e29b6752e Fixed packaging of the mac build 2013-01-30 14:17:16 +01:00
Latif Khalifa
046735f043 Merge remote-tracking branch 'upstream/exp' 2013-01-30 05:49:45 +01:00
Latif Khalifa
a9b05fd029 Merge remote-tracking branch 'lirusato/master' 2013-01-30 05:48:45 +01:00
Latif Khalifa
5c8e436401 Fix windows build: warnings management 2013-01-30 05:45:00 +01:00
Latif Khalifa
4d805da6ac Package glod and colladadom dlls 2013-01-30 05:43:17 +01:00
Latif Khalifa
085800f6e0 Tell the compiler we are using colladadom dll, and not a static lib. Use our current boost libs 2013-01-30 05:27:10 +01:00
Latif Khalifa
1934fc9bd4 Temporarily disable HACD file save functions (not used) to avoid strange linking issue on windows 2013-01-30 05:25:05 +01:00
Latif Khalifa
8c1848b487 Silence secure CRT warnings when building HACD 2013-01-30 05:14:48 +01:00
Latif Khalifa
8edb10fb88 Merge remote-tracking branch 'aleric/meshupload' into meshupload 2013-01-30 05:12:04 +01:00
Aleric Inglewood
8aecc49456 Add missing notifications. 2013-01-30 03:58:42 +01:00
Latif Khalifa
b8919c21d8 Merge remote-tracking branch 'aleric/meshupload' into meshupload 2013-01-30 03:46:45 +01:00
Aleric Inglewood
9203b24eb9 Remove AIStateMachineThreadBase* argument from AIThreadImpl constructor.
Also removes the use of 'this' to initialize base classes, which led to
a compiler warning on vs2010.
2013-01-30 03:44:02 +01: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
1d673df1bd Add AIMeshUpload and fix LLMeshUploadThread
* Removes polling stuff (call to gMeshRepo.update()) which did
  nothing but check if uploads already finished.
* Just creates and runs the state machine (AIMeshUpload) instead
  of creating an LLThread derived class (LLMeshUploadThread) and
  adding that to a queue, then have the main thread start it
  after adding it to another queue in order to keep track of
  the instances (both queues are gone).
* mWholeModelUploadURL was moved to the state machine, because
  it needs a life time till the responders finishes (can't be
  part of the thread object).
* LLMeshUploadThread is now derived from AIThreadImpl instead
  of LLThread, so it can be run in a state machine thread.
* The call to LLHTTPClient::post is now done from the main
  thread instead of from the thread, but I don't think that is
  a problem.
2013-01-29 23:42:06 +01:00
Aleric Inglewood
b3adf71ed7 Remember floater rectangle 2013-01-29 23:20:02 +01:00
Aleric Inglewood
7ba0b6482c Fix example code. 2013-01-29 20:49:53 +01:00
Aleric Inglewood
e99175444f Bike fix: Always set mStatus to STOPPED 2013-01-29 20:45:08 +01:00
Aleric Inglewood
d5ed31ca9b Allow passing a name to underlaying LLThread in debug mode. 2013-01-29 20:44:14 +01:00
Aleric Inglewood
1c8027b1e6 Add statemachine parent callback support to LLHTTPClient::post 2013-01-27 22:02:19 +01:00
Aleric Inglewood
ebac80b5b7 Fix termination race condition. 2013-01-27 20:52:21 +01:00
Siana Gearz
4cab6a89a9 1024-sized terrain texture support 2013-01-27 06:06:13 +01:00
Siana Gearz
50a360d314 Silence voice complaint about missing cap 2013-01-27 04:42:00 +01:00
Lirusaito
4e96dccd7c Fix Issue 385: Group chat announces in window not in Instant message
Improved Ignore Group functions
Best viewed without space changes.
2013-01-26 21:47:32 -05:00
Siana Gearz
7755033017 Lazily fix static deinitialization fiasco 2013-01-27 01:43:38 +01:00
Siana Gearz
aed472af77 Try to fix long-standing crash-on-resize in Linux.
It appear's SDL's SetVideoMode can cause repeat SDL_VIDEORESIZE message and shouldn't be called again.
2013-01-27 01:41:17 +01:00
Aleric Inglewood
c528a15e95 Added AIStateMachineThread 2013-01-26 19:19:09 +01:00