diff options
author | Jay Threeth | 2011-04-02 18:56:23 -0700 |
---|---|---|
committer | Jay Threeth | 2011-04-02 18:56:23 -0700 |
commit | 93cdc938be59db040fa2eb26c478d2328c34da7b (patch) | |
tree | f4f25b9c7343787fe0bb2b3c39efd1362763b376 /linden/indra/newview/llstartup.cpp | |
parent | Merge branch 'exp' of github.com:onefang/meta-impy into libotr (diff) | |
download | meta-impy-93cdc938be59db040fa2eb26c478d2328c34da7b.zip meta-impy-93cdc938be59db040fa2eb26c478d2328c34da7b.tar.gz meta-impy-93cdc938be59db040fa2eb26c478d2328c34da7b.tar.bz2 meta-impy-93cdc938be59db040fa2eb26c478d2328c34da7b.tar.xz |
checkpoint, non functional
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index d9ab5e7..d13e112 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -215,6 +215,10 @@ | |||
215 | #include "hippogridmanager.h" | 215 | #include "hippogridmanager.h" |
216 | #include "hippolimits.h" | 216 | #include "hippolimits.h" |
217 | 217 | ||
218 | #if USE_OTR // [$PLOTR$] | ||
219 | #include "otr_wrapper.h" | ||
220 | #endif // USE_OTR // [/$PLOTR$] | ||
221 | |||
218 | #include "lggautocorrect.h" | 222 | #include "lggautocorrect.h" |
219 | // | 223 | // |
220 | // exported globals | 224 | // exported globals |
@@ -2825,6 +2829,9 @@ bool idle_startup() | |||
2825 | } | 2829 | } |
2826 | 2830 | ||
2827 | LLFirstUse::ClientTags(); | 2831 | LLFirstUse::ClientTags(); |
2832 | #if USE_OTR // [$PLOTR$] | ||
2833 | LLFirstUse::EmeraldOTR(); | ||
2834 | #endif // USE_OTR // [/$PLOTR$] | ||
2828 | 2835 | ||
2829 | // Add login location to teleport history 'teleported-into' | 2836 | // Add login location to teleport history 'teleported-into' |
2830 | LLVector3 agent_pos=gAgent.getPositionAgent(); | 2837 | LLVector3 agent_pos=gAgent.getPositionAgent(); |
@@ -2867,7 +2874,11 @@ bool idle_startup() | |||
2867 | { | 2874 | { |
2868 | gAgent.requestEnterGodMode(); | 2875 | gAgent.requestEnterGodMode(); |
2869 | } | 2876 | } |
2870 | 2877 | ||
2878 | #if USE_OTR // [$PLOTR$] | ||
2879 | OTR_Wrapper::init(); | ||
2880 | #endif // USE_OTR // [/$PLOTR$] | ||
2881 | |||
2871 | // Start automatic replay if the flag is set. | 2882 | // Start automatic replay if the flag is set. |
2872 | if (gSavedSettings.getBOOL("StatsAutoRun")) | 2883 | if (gSavedSettings.getBOOL("StatsAutoRun")) |
2873 | { | 2884 | { |