I hereby claim:
- I am lirumouse on github.
- I am liru (https://keybase.io/liru) on keybase.
- I have a public key ASAR-dpUoZqdq6RiAiJKCMHFjnaQvPr22M4x8NHhKHJWIgo
To claim this, I am signing this object:
I hereby claim:
To claim this, I am signing this object:
### Keybase proof | |
I hereby claim: | |
* I am Lirusaito on github. | |
* I am liru (https://keybase.io/liru) on keybase. | |
* I have a public key whose fingerprint is 0232 FA47 435F 9A5E 2347 DA3B 4FD3 7EDB 57A3 8AD1 | |
To claim this, I am signing this object: |
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp | |
index 9ddc4b0..243ea84 100644 | |
--- a/indra/newview/llinventorybridge.cpp | |
+++ b/indra/newview/llinventorybridge.cpp | |
@@ -3822,6 +3822,12 @@ void LLFolderBridge::createWearable(LLFolderBridge* bridge, LLWearableType::ETyp | |
LLAgentWearables::createWearable(type, false, parent_id); | |
} | |
+static void replace_check(bool act, LLViewerInventoryCategory* cat) | |
+{ |
#include "mew.h" // defines class Mew | |
#include "arf.h" // defines class Arf | |
#include "foo.h" // defines class Foo | |
class Your : public Mew, public Arf, public Foo | |
{}; | |
class Us | |
{ | |
Mew mMew; |
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp | |
index 1911387..c5bc00d 100644 | |
--- a/indra/newview/llfloaterland.cpp | |
+++ b/indra/newview/llfloaterland.cpp | |
@@ -481,52 +481,9 @@ void LLPanelLandGeneral::refresh() | |
} | |
if (!parcel) | |
{ | |
- // nothing selected, disable panel | |
- mEditName->setEnabled(FALSE); |
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp | |
index 8d4820d..fb1aa99 100644 | |
--- a/indra/newview/lltoolbar.cpp | |
+++ b/indra/newview/lltoolbar.cpp | |
@@ -84,8 +84,8 @@ | |
class LLFakeResizeHandle : public LLResizeHandle | |
{ | |
public: | |
- LLFakeResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM ) | |
- : LLResizeHandle(name, rect, min_width, min_height, corner ) |
2013-05-27T12:24:55Z INFO: openItem: LLTaskLSLBridge::openItem() d737ade3-9e27-1583-249d-81bd8fa86787 | |
2013-05-27T12:24:55Z llui/lltexteditor.cpp(4357) : error | |
2013-05-27T12:24:55Z ERROR: loadKeywords: | |
ASSERT(mSegments.back()->getEnd() == getLength()) | |
file:llui/lltexteditor.cpp line:4357 | |
LogLock::LogLock: failed to get mutex for log | |
LogLock::LogLock: failed to get mutex for log | |
(singularity-do-not-run-directly:8251): Gdk-CRITICAL **: IA__gdk_error_trap_pop: assertion `gdk_error_traps != NULL' failed | |
LogLock::LogLock: failed to get mutex for log |
[ 0%] Building CXX object aistatemachine/CMakeFiles/aistatemachine.dir/aistatemachine.cpp.o | |
In file included from indra/llcommon/llstringtable.h:39:0, | |
from indra/llcommon/string_table.h:32, | |
from indra/llcommon/llinstancetracker.h:34, | |
from indra/llcommon/llfasttimer_class.h:30, | |
from indra/llcommon/llfasttimer.h:33, | |
from indra/llcommon/llstring.h:35, | |
from indra/llcommon/llfile.h:60, | |
from indra/llcommon/linden_common.h:68, | |
from indra/aistatemachine/aistatemachine.cpp:34: |
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml | |
index 98336d3..a0a0198 100644 | |
--- a/indra/newview/app_settings/settings.xml | |
+++ b/indra/newview/app_settings/settings.xml | |
@@ -16636,6 +16636,17 @@ This should be as low as possible, but too low may break functionality</string> | |
<key>Value</key> | |
<string>Random</string> | |
</map> | |
+ <key>ConsoleBottomOffset</key> | |
+ <map> |
2013-04-03T11:32:22Z INFO: cleanup: Message system deleted. | |
[Thread 0x7fffef19c700 (LWP 22235) exited] | |
[Thread 0x7fffee99b700 (LWP 22236) exited] | |
2013-04-03T11:32:23Z INFO: stopEngineThread: State machine thread stopped after 0ms. | |
2013-04-03T11:32:23Z INFO: ~MultiHandle: Destructing MultiHandle with 1 active curl easy handles. | |
[Thread 0x7fffee19a700 (LWP 22237) exited] | |
2013-04-03T11:32:23Z INFO: stopCurlThread: Curl thread stopped after 10ms. | |
2013-04-03T11:32:23Z aistatemachine/aistatemachine.h(208) : error | |
2013-04-03T11:32:23Z ERROR: ~AIStateMachine: | |
ASSERT(multiplex_state_type_rat(mState)->base_state == bs_killed) |