Merge sl-search-opt-in back into the release branch
Reviewed by Josh and Don
Showing
- etc/message.xml 8 additions, 0 deletionsetc/message.xml
- indra/llmessage/llregionflags.h 3 additions, 0 deletionsindra/llmessage/llregionflags.h
- indra/llprimitive/object_flags.h 2 additions, 1 deletionindra/llprimitive/object_flags.h
- indra/newview/llagent.cpp 69 additions, 2 deletionsindra/newview/llagent.cpp
- indra/newview/llagent.h 2 additions, 1 deletionindra/newview/llagent.h
- indra/newview/llfloaterland.cpp 52 additions, 18 deletionsindra/newview/llfloaterland.cpp
- indra/newview/llfloaterland.h 1 addition, 0 deletionsindra/newview/llfloaterland.h
- indra/newview/llfloaterregioninfo.cpp 63 additions, 32 deletionsindra/newview/llfloaterregioninfo.cpp
- indra/newview/llgroupmgr.cpp 2 additions, 0 deletionsindra/newview/llgroupmgr.cpp
- indra/newview/llgroupmgr.h 1 addition, 0 deletionsindra/newview/llgroupmgr.h
- indra/newview/llpanelavatar.cpp 15 additions, 13 deletionsindra/newview/llpanelavatar.cpp
- indra/newview/llpanelgroup.cpp 1 addition, 1 deletionindra/newview/llpanelgroup.cpp
- indra/newview/llpanelgroupgeneral.cpp 86 additions, 87 deletionsindra/newview/llpanelgroupgeneral.cpp
- indra/newview/llpanelgroupgeneral.h 2 additions, 1 deletionindra/newview/llpanelgroupgeneral.h
- indra/newview/llpanelpermissions.cpp 24 additions, 1 deletionindra/newview/llpanelpermissions.cpp
- indra/newview/llpanelpermissions.h 1 addition, 0 deletionsindra/newview/llpanelpermissions.h
- indra/newview/llselectmgr.cpp 44 additions, 0 deletionsindra/newview/llselectmgr.cpp
- indra/newview/llselectmgr.h 3 additions, 0 deletionsindra/newview/llselectmgr.h
- indra/newview/llviewerobject.cpp 17 additions, 0 deletionsindra/newview/llviewerobject.cpp
- indra/newview/llviewerobject.h 3 additions, 0 deletionsindra/newview/llviewerobject.h
Loading
Please register or sign in to comment