aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2159-896/+2097
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' into careminsterMelanie2014-01-281-0/+7
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-161-0/+7
| | |\
| | | * Can delete the Offline Messages sent to/from a user.Oren Hurvitz2014-01-161-0/+7
| | | | | | | | | | | | | | | | This is useful if the user is deleted.
| * | | Merge branch 'master' into careminsterMelanie2014-01-281-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-111-1/+1
| | |\ \ | | | |/
| | | * Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.Oren Hurvitz2014-01-111-1/+1
| | | |
| * | | Remove the core module extra profile settings support carried in with the latestMelanie2014-01-051-0/+2
| | | | | | | | | | | | | | | | patches. We don't need it.
| * | | Intermediate commit. Sill errors.Melanie2014-01-056-4/+143
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * | Remove some chatty DebugFormat statements. No functional changes.Robert Adams2014-01-042-5/+4
| | | |
| | * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-042-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| | * | varregion: send region size in LLLoginResponse.Robert Adams2014-01-042-1/+13
| | | |
| | * | Initialize default region size in GridRegion in the no parameter constructorRobert Adams2013-12-281-0/+2
| | | | | | | | | | | | | | | | as is used by the grid connector tests.
| | * | Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵Robert Adams2013-12-282-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size.
| | * | Populate user preferences with UserAccount email if it is present, else ↵BlueWall2013-12-161-0/+61
| | |/ | | | | | | | | | return an error indicating no email is on record for the user.
| * | Revert "Add support for user preferences (im via email)"Melanie2013-12-072-17/+0
| | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| * | Merge branch 'master' into careminsterMelanie2013-12-073-3/+17
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-12-062-0/+17
| | |\
| | | * Add support for user preferences (im via email)BlueWall2013-12-062-0/+17
| | | |
| | * | Fixed misleading commentDiva Canto2013-12-061-3/+0
| | |/
| * | Merge branch 'master' into careminsterMelanie2013-11-233-8/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase ↵Justin Clark-Casey (justincc)2013-11-151-6/+13
| | | | | | | | | | | | | | | | | | | | | folder when required, then don't try to store the null and perform other operations on it. Patch from http://opensimulator.org/mantis/view.php?id=6844 Thanks Kira.
| | * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| | * minor: comment out "SetLastPosition" GridUserService debug message for now.Justin Clark-Casey (justincc)2013-11-051-1/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2013-11-081-8/+11
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * Give the caller AddMapTile a valid reason response if this failed due to ↵Justin Clark-Casey (justincc)2013-10-291-8/+11
| | | | | | | | | | | | | | | | | | blank response from server or connection failure. Raise log lines which indicate problems to warning from debug
| * | Merge branch 'master' into careminsterMelanie2013-10-0616-16/+16
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-0416-16/+16
| | |
| * | Merge branch 'avination-current' into careminsterMelanie2013-09-161-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-09-077-4/+128
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | Fix logic errors in "show grid users online" console command which didn't ↵Justin Clark-Casey (justincc)2013-09-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | actually filter out users shown continuously online for more than 5 days Remove confusion in command output.
| | * | Add experimental "show grid users online" console command to show grid users ↵Justin Clark-Casey (justincc)2013-09-031-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | online from a standalone/robust instance. This is not guaranteed to be accurate since users may be left "online" in certain situations. For example, if a simulator crashes and they never login/logout again. To counter this somewhat, only users continuously online for less than 5 days are shown.
| | * | Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-026-4/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
| * | | Merge branch 'master' into careminsterMelanie2013-09-013-31/+39
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | Do not add a port zero to end of the hypergrid gateway host name.Robert Adams2013-08-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | If the port is specified it is added but a ":0" is not added if the port is zero. This enables the hypergrid address short form "hypergridGateway:regionName" which is handled by the parser but failed because of this zero port addition.
| | * | Revert "Make HG logins fall back to fallback regions if the desired region ↵Justin Clark-Casey (justincc)2013-08-261-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails." This is very similar to my earlier revert in bcb8605f8428a9009a2badf9c9eed06d9f59962c and fails for the same reasons. Reverting this change because it causes a problem if access is denied to the user. This reverts commit c7a8afbb8da40e09252d58d95c89b8a99a684157.
| | * | Revert "Added some more debug messages."Justin Clark-Casey (justincc)2013-08-261-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer Reverting because this introduces a bug when access does fail. More detail in revert of main commit. This reverts commit ec32c1d4b69e4219fe44a38bcbc411e7996641f1.
| | * | Added some more debug messages.Diva Canto2013-08-241-1/+4
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-241-26/+27
| | |\ \
| | | * | remove redundant return at end of HandleDeregisterRegion()Justin Clark-Casey (justincc)2013-08-231-2/+0
| | | | |
| | | * | Make it possible for the "deregister region id" command to accept more than ↵Justin Clark-Casey (justincc)2013-08-231-24/+27
| | | | | | | | | | | | | | | | | | | | one id
| | * | | Make HG logins fall back to fallback regions if the desired region fails.Diva Canto2013-08-241-3/+24
| | |/ /
| | * | minor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so ↵Justin Clark-Casey (justincc)2013-08-221-4/+8
| | | | | | | | | | | | | | | | that we can distinguish between simultaneous logins
| | * | Revert "Implement ability for hg logins to try fallback regions just like ↵Justin Clark-Casey (justincc)2013-08-221-39/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | local logins." This approach does not work - it is taking place too far down the login process where really the region checking could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol change to pass the agentID as well as the requested regionID) This reverts commit 3d9b73c47a15cf00150ac80570fea88de8cecbdf.
| | * | Implement ability for hg logins to try fallback regions just like local logins.Justin Clark-Casey (justincc)2013-08-211-5/+39
| | | | | | | | | | | | | | | | | | | | These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text. Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
| * | | Merge branch 'master' into careminsterMelanie2013-08-173-14/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| | * | minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGridJustin Clark-Casey (justincc)2013-08-172-9/+2
| | | |
| | * | minor: Make log messages consistent in NeighbourServicesConnectorJustin Clark-Casey (justincc)2013-08-171-6/+6
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-08-072-3/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | Remove some debugging from simian connectors.Mic Bowman2013-08-052-3/+11
| | | |
generated by cgit v1.1 at 2024-11-07 05:30:14 +0000