diff options
| -rw-r--r--[-rwxr-xr-x] | indra/llmessage/llcurl.h | 0 | ||||
| -rw-r--r-- | indra/llui/llcommandmanager.h | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/featuretable.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llviewerobject.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llvovolume.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/xui/en/floater_model_preview.xml | 0 |
6 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index 87de202717..87de202717 100755..100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h index b11f905574..8e5abd6461 100644 --- a/indra/llui/llcommandmanager.h +++ b/indra/llui/llcommandmanager.h @@ -53,13 +53,13 @@ public: LLCommandId(const std::string& name) : mName(name) { - mUUID = LLUUID::LLUUID::generateNewID(name); + mUUID = LLUUID::generateNewID(name); } LLCommandId(const Params& p) : mName(p.name) { - mUUID = LLUUID::LLUUID::generateNewID(p.name); + mUUID = LLUUID::generateNewID(p.name); } const std::string& name() const { return mName; } diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index e12c2f7853..e12c2f7853 100755..100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d81e67bfe2..d81e67bfe2 100755..100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 380d63c77b..380d63c77b 100755..100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 2eea286c8b..2eea286c8b 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml |