livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged into release with command: 

=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .

QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar

DEV's fulfilled as part of this branch:
======================================

DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
master
Kartic Krishnamurthy 2008-11-07 00:07:44 +00:00
parent 24ff4831f2
commit b2bfb128e7
9 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -14,6 +14,7 @@ Adam Marker
Aimee Trescothick
VWR-3903
VWR-4083
VWR-9255
Alejandro Rosenthal
VWR-1184
Alissa Sabre

4
indra/CMakeLists.txt
View File

@ -19,6 +19,10 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(Variables)
if (DARWIN)
cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
endif (DARWIN)
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
"Build type. One of: Debug Release RelWithDebInfo" FORCE)

18
indra/cmake/APR.cmake
View File

@ -15,23 +15,17 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(apr_suite)
if (WINDOWS)
set(WINLIBS_PREBUILT_DEBUG_DIR
${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
)
set(WINLIBS_PREBUILT_RELEASE_DIR
${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
)
set(APR_LIBRARIES
debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib
optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
)
set(APRUTIL_LIBRARIES
debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib
optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
)
set(APRICONV_LIBRARIES
debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
)
elseif (DARWIN)
set(APR_LIBRARIES

1
indra/cmake/CMakeLists.txt
View File

@ -48,7 +48,6 @@ set(cmake_SOURCE_FILES
LLMath.cmake
LLMedia.cmake
LLMessage.cmake
LLPhysics.cmake
LLPrimitive.cmake
LLRender.cmake
LLScene.cmake

8
indra/cmake/Linking.cmake
View File

@ -7,15 +7,15 @@ if (NOT STANDALONE)
set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
elseif (LINUX)
if (VIEWER)
set(ARCH_PREBUILT_DIRS
${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
else (VIEWER)
set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
endif (VIEWER)
set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
elseif (DARWIN)
set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
endif (WINDOWS)
endif (NOT STANDALONE)

16
indra/lib/python/indra/util/named_query.py
View File

@ -103,10 +103,11 @@ class NamedQuery(object):
def __init__(self, name, filename):
""" Construct a NamedQuery object. The name argument is an
arbitrary name as a handle for the query, and the filename is
a path to a file containing an llsd named query document."""
a path to a file or a file-like object containing an llsd named
query document."""
self._stat_interval_seconds = 5 # 5 seconds
self._name = name
if (filename is not None
if (filename is not None and isinstance(filename, (str, unicode))
and NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
filename = filename + NQ_FILE_SUFFIX
self._location = filename
@ -122,8 +123,8 @@ class NamedQuery(object):
def get_modtime(self):
""" Returns the mtime (last modified time) of the named query
file, if such exists."""
if self._location:
filename. For file-like objects, expect a modtime of 0"""
if self._location and isinstance(self._location, (str, unicode)):
return os.path.getmtime(self._location)
return 0
@ -131,7 +132,12 @@ class NamedQuery(object):
""" Loads and parses the named query file into self. Does
nothing if self.location is nonexistant."""
if self._location:
self._reference_contents(llsd.parse(open(self._location).read()))
if isinstance(self._location, (str, unicode)):
contents = llsd.parse(open(self._location).read())
else:
# we probably have a file-like object. Godspeed!
contents = llsd.parse(self._location.read())
self._reference_contents(contents)
# Check for alternative implementations
try:
for name, alt in self._contents['alternative'].items():

11
indra/mac_crash_logger/CMakeLists.txt
View File

@ -35,7 +35,6 @@ set_source_files_properties(${mac_crash_logger_HEADER_FILES}
list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_HEADER_FILES})
set(mac_crash_logger_RESOURCE_FILES
Info.plist
CrashReporter.nib/
)
set_source_files_properties(
@ -43,11 +42,6 @@ set_source_files_properties(
PROPERTIES
HEADER_FILE_ONLY TRUE
)
set_source_files_properties(
Info.plist
PROPERTIES
MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
)
SOURCE_GROUP("Resources" FILES ${mac_crash_logger_RESOURCE_FILES})
list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_RESOURCE_FILES})
@ -55,6 +49,11 @@ add_executable(mac-crash-logger
MACOSX_BUNDLE
${mac_crash_logger_SOURCE_FILES})
set_target_properties(mac-crash-logger
PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
target_link_libraries(mac-crash-logger
${LLCRASHLOGGER_LIBRARIES}
${LLVFS_LIBRARIES}

13
indra/mac_updater/CMakeLists.txt
View File

@ -42,7 +42,6 @@ list(APPEND mac_updater_SOURCE_FILES ${mac_updater_HEADER_FILES})
set(mac_updater_RESOURCE_FILES
Info.plist
AutoUpdater.nib/
)
set_source_files_properties(
@ -50,19 +49,18 @@ set_source_files_properties(
PROPERTIES
HEADER_FILE_ONLY TRUE
)
set_source_files_properties(
Info.plist
PROPERTIES
MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
)
SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES})
list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES})
add_executable(mac-updater
MACOSX_BUNDLE
${mac_updater_SOURCE_FILES})
set_target_properties(mac-updater
PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
target_link_libraries(mac-updater
${LLVFS_LIBRARIES}
${CURL_LIBRARIES}
@ -79,4 +77,3 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
)

11
indra/test/llsd_new_tut.cpp
View File

@ -108,7 +108,7 @@ namespace tut
SDCleanupCheck check;
LLSD v;
v = true; ensureTypeAndValue("set true", v, true);
v = false; ensureTypeAndValue("set false", v, false);
v = true; ensureTypeAndValue("set true again", v, true);
@ -749,6 +749,15 @@ namespace tut
}
}
template<> template<>
void SDTestObject::test<14>()
// make sure that assignment of char* NULL in a string does not crash.
{
LLSD v;
v = (const char*)NULL;
ensure("type is a string", v.isString());
}
/* TO DO:
conversion of undefined to UUID, Date, URI and Binary
conversion of undefined to map and array