OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-04-10 14:38:18 -04:00
parent 679533f632 fb44e7b636
commit 3e6043bb47
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -429,7 +429,10 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
bool isMember; bool isMember;
if (m_groupMemberCache.TryGetValue(avatar, out isMember)) if (m_groupMemberCache.TryGetValue(avatar, out isMember))
{
m_groupMemberCache.Update(avatar, isMember, m_groupMemberCacheTimeout);
return isMember; return isMember;
}
IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>(); IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
if (groupsModule == null) if (groupsModule == null)

2
bin/OpenSimDefaults.ini
View File

@ -1129,7 +1129,7 @@
; Maximum number of llListen events we allow over the entire region. ; Maximum number of llListen events we allow over the entire region.
; Set this to 0 to have no limit imposed ; Set this to 0 to have no limit imposed
max_listeners_per_region = 1000 max_listens_per_region = 1000
; Maximum number of llListen events we allow per script ; Maximum number of llListen events we allow per script
; Set this to 0 to have no limit imposed. ; Set this to 0 to have no limit imposed.

12
bin/Robust.HG.ini.example
View File

@ -319,13 +319,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; password help: optional: page providing password assistance for users of your grid ; password help: optional: page providing password assistance for users of your grid
;password = http://127.0.0.1/password ;password = http://127.0.0.1/password
; HG address of the gatekeeper, if you have one ; HG address of the gatekeeper, if you have one
; this is the entry point for all the regions of the world ; this is the entry point for all the regions of the world
; gatekeeper = http://127.0.0.1:8002/ ; gatekeeper = http://127.0.0.1:8002/
; HG user domain, if you have one ; HG user domain, if you have one
; this is the entry point for all user-related HG services ; this is the entry point for all user-related HG services
; uas = http://127.0.0.1:8002/ ; uas = http://127.0.0.1:8002/
[GatekeeperService] [GatekeeperService]
LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"

12
bin/config-include/StandaloneCommon.ini.example
View File

@ -231,13 +231,13 @@
; currently unused ; currently unused
;password = http://127.0.0.1/password ;password = http://127.0.0.1/password
; HG address of the gatekeeper, if you have one ; HG address of the gatekeeper, if you have one
; this is the entry point for all the regions of the world ; this is the entry point for all the regions of the world
; gatekeeper = http://127.0.0.1:9000/ ; gatekeeper = http://127.0.0.1:9000/
; HG user domain, if you have one ; HG user domain, if you have one
; this is the entry point for all user-related HG services ; this is the entry point for all user-related HG services
; uas = http://127.0.0.1:9000/ ; uas = http://127.0.0.1:9000/
[MapImageService] [MapImageService]
; Set this if you want to change the default ; Set this if you want to change the default