aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-173-10/+4
|\
| * Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\
| | * Fix merge artefactsMelanie2012-07-173-10/+4
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-177-83/+13
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-177-83/+13
| |\ \ | | |/
| | * Merge branch 'master' into careminsterMelanie2012-07-167-83/+13
| | |\
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-07-161-30/+13
| | | |\
| | | | * refactor: factor out common code in WebStatsModule.OnMakeRootAgent()Justin Clark-Casey (justincc)2012-07-161-8/+7
| | | | |
| | | | * In WebStatsModule.OnMakeRootAgent(), get region ID directly from ↵Justin Clark-Casey (justincc)2012-07-161-18/+2
| | | | | | | | | | | | | | | | | | | | SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list.
| | | | * Stop warning about no session from ViewerStats if user teleports to another ↵Justin Clark-Casey (justincc)2012-07-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region in the same simulator that was not next to the source region. This was because teleporting to the new region invoked the new session setup code before the agent was removed from the old region, which then invoked the session teardown code. Now, we only invoke the teardown code if the region ID occupied by the agent being removed is the same as the one registered for the current session.
| | | * | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-17381-8330/+17075
|\ \ \ \ | |/ / /
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-17381-8330/+17075
| |\ \ \ | | |/ /
| | * | Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
| | |\ \ \ | | | | |/ | | | |/|
| | | * | sending more user-friendly messages to the script error window rather than ↵SignpostMarv2012-07-161-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the thrown exceptions. Signed-off-by: Melanie <melanie@t-data.com>
| | * | | Merge branch 'master' into careminsterMelanie2012-07-163-207/+275
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | | * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵dahlia2012-07-131-143/+183
| | | | | | | | | | | | | | | | | | | | sliced linear prims. Addresses Mantis #6085
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7
| | | | |
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-39/+42
| | | | |
| | | * | added in some extra variables, it sometimes thinks it is on the same parcel :(SignpostMarv2012-07-141-5/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: SignpostMarv <github@signpostmarv.name>
| | | * | adding workaround for silent failure if position is outside the bounds of a ↵SignpostMarv2012-07-141-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region, implementing parcel prim count check. Signed-off-by: SignpostMarv <github@signpostmarv.name>
| | | * | Implementation of llSetRegionPos(). Does not implement failure on object ↵SignpostMarv2012-07-143-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entry/prim limit/access restrictions. Signed-off-by: SignpostMarv <github@signpostmarv.name>
| | | * | When generating a Warp3D texture, set the detailTexture[i] variable on ↵Justin Clark-Casey (justincc)2012-07-141-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resize from the JPEG2000 original rather than only saving it to disk. This appears to be the cause of the warp 3d exception seen when starting a new region for the first time. Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk. Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
| | * | | Merge branch 'master' into careminsterMelanie2012-07-1328-211/+176
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | | * | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| | | | |
| | | * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-1315-84/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
| | | * | Don't cache regions data on the other unused LocalGridServiceConnector that ↵Justin Clark-Casey (justincc)2012-07-134-22/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
| | | * | Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-122-5/+2
| | | | | | | | | | | | | | | | | | | | This can always be retrieved via the LLUDPClient and is so done in various places already.
| | | * | Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-122-30/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor. Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
| | | * | Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-126-27/+2
| | | | | | | | | | | | | | | | | | | | IClientAPI.RemoteEndpoint.
| | | * | Change very recent AllowedViewerList and BannedViewerList config setting ↵Justin Clark-Casey (justincc)2012-07-122-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService] Also changes separator from comma to bar to match existing [LoginService] config features. Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
| | | * | Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-122-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Also change to use standard table formatting "show circuits" and "show connections" console commands are very similar but access different data structures.
| | | * | Add active status to "show connections"Justin Clark-Casey (justincc)2012-07-121-1/+7
| | | | |
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-122-23/+93
| | | |\ \
| | | * | | Put output for "show connections" command into standard table format.Justin Clark-Casey (justincc)2012-07-121-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also moves into own method.
| | * | | | Merge branch 'master' into careminsterMelanie2012-07-1232-166/+393
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| | | * | | Many explanitory comments added to the link and delink code inRobert Adams2012-07-112-23/+93
| | | |/ / | | | | | | | | | | | | | | | SOG and SOP. Should have no functionality changes.
| | | * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-1120-80/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
| | | * | Fix build break for windows with missing package for IScriptEngine in ↵Justin Clark-Casey (justincc)2012-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | prebuild.xml for OpenSim.Region.CoreModules.Tests.dll
| | | * | Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-113-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
| | | * | Remove WorldComm module from the regression TestCompileAndStartScript() ↵Justin Clark-Casey (justincc)2012-07-111-4/+1
| | | | | | | | | | | | | | | | | | | | since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths
| | | * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-119-32/+151
| | | | | | | | | | | | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
| | | * | Add regression TestRezScriptedAttachmentsFromInventory() though this ↵Justin Clark-Casey (justincc)2012-07-113-23/+85
| | | | | | | | | | | | | | | | | | | | currently only checks for the presence of script items, not for started scripts
| | * | | Merge branch 'avination' into careminsterMelanie2012-07-1121-400/+746
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-1139-315/+963
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | | * | | If a part has a sit target and an avatar is already sitting, allow another ↵Justin Clark-Casey (justincc)2012-07-101-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avatar to sit in the position given if no sit target was set. Previous behave was that the second avatar could not sit. This matches behaviour observed on the LL grid.
| | | * | | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵Justin Clark-Casey (justincc)2012-07-102-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | and SOP.RemoveSittingAvatar()
| | | * | | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-102-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
| | | * | | refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-102-3/+8
| | | | | |
generated by cgit v1.1 at 2024-12-22 22:19:21 +0000