aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include (follow)
Commit message (Collapse)AuthorAgeFilesLines
* minor: convert tabs to spaces in config example files from recent 7c534e5Justin Clark-Casey (justincc)2012-04-101-6/+6
|
* Added gatekeeper and uas addresses to grid info, so that viewers can take ↵Diva Canto2012-04-071-0/+8
| | | | advantage of that info.
* User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-0/+7
| | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-2/+1
|\ | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-191-2/+1
| | | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-1/+5
|/ | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* More on HG access control. This commit splits the UserManagementModule into ↵Diva Canto2012-03-172-0/+2
| | | | the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
* BAD JUSTIN!Diva Canto2012-03-171-0/+1
| | | | | People using standalone in master, please update your StandaloneCommon.ini according to this change. People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
* Region access control! Region operators can now specify things like ↵Diva Canto2012-03-176-6/+24
| | | | DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
* Add warning about only uncommenting EstateConnectionString if you know what ↵Justin Clark-Casey (justincc)2012-02-071-0/+2
| | | | you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example)
* Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in ↵Justin Clark-Casey (justincc)2012-01-281-1/+1
| | | | | | GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example As per http://opensimulator.org/mantis/view.php?id=5852, confirmed by diva via aiaustin
* Update osGetGrid**** functionsBlueWall2012-01-171-0/+6
| | | | The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
* HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-122-4/+4
| | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-303-3/+3
| | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
* Add more documentation to EstateConnectorString in StandaloneCommon.ini.exampleJustin Clark-Casey (justincc)2011-12-171-1/+4
|
* Rename some of the example commented out server names to mygridserver.com ↵Justin Clark-Casey (justincc)2011-10-221-23/+21
| | | | | | | like all the others. This is to make it easier to change all these names at once, where all grids services are running from the same location. Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent.
* Make config comments about choosing assetcache modules clearer.Justin Clark-Casey (justincc)2011-10-222-17/+19
| | | | | OpenSim needs an asset cache. Running without one will cause problems. Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850
* Make it possible to disable the HG linker. On non-HG systems it spits yellowMelanie2011-10-123-0/+3
| | | | spam, so it should not load unless HG is desired.
* On standalone, by default create the necessary minimum body parts and ↵Justin Clark-Casey (justincc)2011-09-161-2/+5
| | | | | | | clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini This is left as false in grid mode
* Write code to create minimum necessary body parts/clothing and avatar ↵Justin Clark-Casey (justincc)2011-09-151-0/+1
| | | | | | | | | | | | entries to make a newly created user appear as a non-cloud on viewer 2 Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries. Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim. Default is currently off. My intention is to switch it on for standalone shortly. This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities. Need to fix creation of suitable entries for users created as estate owners on standalone. Avatars still appear with spooky empty eyes, need to see if we can address this. This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used.
* minor: Add explanative text for the new currency parameter. Convert some ↵Justin Clark-Casey (justincc)2011-08-221-16/+17
| | | | tabs to spaces
* Change the default standalone asset cache to be the Flotsam asset cache ↵Justin Clark-Casey (justincc)2011-08-162-5/+7
| | | | | | | (with memory caching not enabled). This matches the GridCommon setting and is the best tested setting. It appears to work fine on standalone. Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained.
* Added optional Login Service parameter "Currency" to be able to change the ↵Snoopy Pfeffer2011-08-141-0/+2
| | | | currency name shown in the viewer.
* Add a warning to URI config in GridCommon.ini.example not to add a slash to ↵Justin Clark-Casey (justincc)2011-07-121-18/+18
| | | | | | the end. Tidy up GridCommon.ini.example
* Make it possible to disable the file part of the flotsam asset cacheJustin Clark-Casey (justincc)2011-07-041-1/+4
| | | | | | | | This matches the ability to disable the memory part This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini Default is true, so existing installations are not affected. Improved fcache command feedback when various caches are disabled. Re-enabled test for flotsam cache with file caching disabled.
* Tell hypergridders when their teleports fail because of the 4096 limit ↵Justin Clark-Casey (justincc)2011-06-241-3/+0
| | | | | | | | | | | rather than just saying "destination not found" Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module This allows us to explicitly tell the hypergridder why the teleport failed (region out of range). It also allows people on regions that are within range (on a large source grid) to teleport. The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased. The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
* Added missing config var for map image service.Diva Canto2011-06-151-0/+4
|
* V2 map now working in grids too. WARNING: A few visible configuration ↵Diva Canto2011-06-133-1/+16
| | | | variables added in order for this to work. See .ini.example changes
* Trailing / in MapTileURL must be there!Diva Canto2011-06-121-1/+1
|
* First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-123-2/+19
| | | | some issues with the zoom level -- TBD.
* Align CenomeCache.ini.example values with CenomeCache defaults.Justin Clark-Casey (justincc)2011-06-111-7/+8
|
* Make it clear that WaitOnInprogressTimeout is currently a dead setting in ↵Justin Clark-Casey (justincc)2011-06-111-0/+1
| | | | FlotsamCache.ini.example
* Make the internal flotsam asset cache defaults match ↵Justin Clark-Casey (justincc)2011-06-111-1/+1
| | | | | | | | | config-include/FlotsamCache.ini.example. Enable the flotsam console commands even if FlotsamCache.ini isn't present. For the most part, defaults are made to match those already in FlotsamCache.ini.example. The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file. This can be tweaked if necessary. Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default). Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache.
* Added missing "Old Guids=true" to ConnectionStringMakopoppo2011-06-101-2/+2
|
* This fixes the crash reported in ↵Diva Canto2011-06-071-0/+1
| | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-06-031-0/+36
|\
| * Move the "!!!Standalone Only!!!" [FreeswitchService] section from ↵Justin Clark-Casey (justincc)2011-06-021-0/+36
| | | | | | | | OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.
* | .ini.example's updated for HG LandmarksDiva Canto2011-06-032-1/+3
|/
* [Profiles] --> [Profile]Diva Canto2011-06-014-4/+4
|
* Adding MSSQL connectionString exampleMakopoppo2011-05-302-0/+16
|
* Fixed one comment in a config file.Diva Canto2011-05-271-0/+1
|
* HG lures working! Friends can offer friends HG teleports via the profile. ↵Diva Canto2011-05-274-2/+15
| | | | WARNING: additional configuration for HG inis -- see *Common.ini.example
* Added a BasicProfilemodule so that the profile-based actions (like give ↵Diva Canto2011-05-274-0/+11
| | | | inventory, etc) work. This is just a mock profile, the same for all users, and with no DB backend behind it -- meaning that nothing will be saved. For serious profiles, use 3rd party implementations.
* Added missing config vars to StandaloneCommon.ini.example and fixed the ones ↵Diva Canto2011-05-261-0/+2
| | | | in Robust.HG.ini.example
* Last commit before pushing. WARNING: (a) DB migration on the friends table; ↵Diva Canto2011-05-261-1/+1
| | | | and (b) several config additions related to HG. See Robust.HG.ini.example, GridCommon.ini.example and/or StandaloneCommon.ini.example.
* HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-262-0/+17
| | | | looked back in source user's User Agent service.
* HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵Diva Canto2011-05-251-0/+10
| | | | testing.
* Added necessary code to drop inventory on hg friends using the profile ↵Diva Canto2011-05-241-1/+1
| | | | window, but can't test because this mechanism doesn't seem to work without a profile service.
* HG friends: Status notifications working. Also initial logins get the online ↵Diva Canto2011-05-231-0/+3
| | | | friends in other grids.
* More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-1/+1
| | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.