| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This ↵ | UbitUmarov | 2012-04-04 | 2 | -3/+3 |
| | | | | | functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque). | ||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-04-04 | 18 | -124/+261 |
| |\ | |||||
| | * | Fix the last merge artefacts | Melanie | 2012-04-03 | 2 | -5/+5 |
| | | | |||||
| | * | More artefact | Melanie | 2012-04-03 | 1 | -1/+1 |
| | | | |||||
| | * | Fix more merge artefacts | Melanie | 2012-04-03 | 1 | -3/+3 |
| | | | |||||
| | * | Remove duplicate implementation of Material { get; set; } | Melanie | 2012-04-03 | 1 | -14/+0 |
| | | | |||||
| | * | Fix merge artefacts | Melanie | 2012-04-03 | 2 | -27/+2 |
| | | | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 18 | -117/+293 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | terrain save-tile extensions Signed-off-by: Garmin Kawaguichi ↵ | Garmin Kawaguichi | 2012-04-03 | 11 | -3/+74 |
| | | | | | | | | | | | | | | | | | | | <garmin.kawaguichi@magalaxie.com> Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | | * | Fix more SOP.PhysActor race conditions in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-03 | 1 | -7/+19 |
| | | | | |||||
| | | * | Eliminate race condition where many callers would check SOP.PhysicsActor != ↵ | Justin Clark-Casey (justincc) | 2012-04-03 | 6 | -155/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it. | ||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-04-01 | 49 | -340/+1604 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 |
| | | | | | | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0) | ||||
| | * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-31 | 4 | -17/+90 |
| | |\ \ | | | | | | | | | | | | | careminster | ||||
| | | * | | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 |
| | | | | | | | | | | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0) | ||||
| | | * | | Cache the last maptile and return the cachrd tile if the last request is | Melanie | 2012-03-29 | 1 | -8/+22 |
| | | | | | | | | | | | | | | | | | less than an hour ago. Avoids generating the maptile twice on startup. | ||||
| | | * | | Allow the map tile module to be enabled without also eabling refresh | Melanie | 2012-03-29 | 1 | -8/+11 |
| | | | | | |||||
| | | * | | Allow llTeleportAgent to work in attachments | Melanie | 2012-03-29 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 34 | -428/+947 |
| | |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs | ||||
| | | * | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 7 | -31/+31 |
| | | | | | | | | | | | | | the 'root' part. | ||||
| | | * | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 4 | -39/+28 |
| | | | | | | | | | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned. | ||||
| | | * | Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlRegionSayTo Addresses http://opensimulator.org/mantis/view.php?id=5950 | ||||
| | | * | Add MSSQL login processing fix for servers run on different locales. | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | This may no longer be an issue with better locale enforcement in OpenSimulator but it doesn't hurt to have this patch. http://opensimulator.org/mantis/view.php?id=4680 Thanks to controlbreak for this | ||||
| | | * | minor: small message adjustment and unnecessary code elimination when ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -2/+2 |
| | | | | | | | | | | | | | notifying client of no build permission | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | Added missing dependency for MS 2008. I hope. (I don't have 2008 to test ↵ | Diva Canto | 2012-03-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | this) mantis #5949 | ||||
| | | * | | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932 | PixelTomsen | 2012-03-31 | 2 | -1/+12 |
| | | |/ | |||||
| | | * | Add Extended flavour option to opensim version information. | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable. This flavour will almost certainly never see a formal release. | ||||
| | | * | minor: remove some now unneeded code from FriendsCommandsModule | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -55/+0 |
| | | | | |||||
| | | * | Make default "show friends" console command show friends fetched from the ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 4 | -8/+87 |
| | | | | | | | | | | | | | | | | | | | friends service. There is no a --cache option which will show friends from the local cache if available. | ||||
| | | * | Lock NullFriendsData.m_Data for consistency and against concurrent read/write | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -30/+39 |
| | | | | |||||
| | | * | refactor: Move "friends show cache" console command out into separate ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 4 | -97/+205 |
| | | | | | | | | | | | | | | | | | | | FriendsCommandsModule. Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation | ||||
| | | * | Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 12 | -85/+177 |
| | | | | | | | | | | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -120/+218 |
| | | |\ | |||||
| | | | * | Finish up the SuitcaseInventory service. | Diva Canto | 2012-03-29 | 1 | -120/+218 |
| | | | | | |||||
| | | * | | refactor: Stop passing both IClientAPI and agentID to friend event ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 6 | -31/+62 |
| | | |/ | | | | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere. | ||||
| | | * | Add simple regression test for logging in with offline friends. Don't ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -1/+46 |
| | | | | | | | | | | | | | expect to receive any in this instance. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -1/+28 |
| | | |\ | |||||
| | | | * | Also add OSS header to interface | Melanie | 2012-03-29 | 1 | -1/+28 |
| | | | | | |||||
| | | * | | Add back parts of reverted changes that were not concerned with child agent ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 8 | -8/+16 |
| | | |/ | | | | | | | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents. | ||||
| | | * | Change namespace on CallingCardModule and correct interface file placemant. ↵ | Melanie | 2012-03-29 | 2 | -2/+29 |
| | | | | | | | | | | | | | Also ass OpenSource header | ||||
| | | * | Revert "Simplify friends caching by only doing this for root agents - no ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 9 | -31/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a. | ||||
| | | * | Revert "Add comment about setting client.SceneAgent in AddNewClient()" | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -3/+0 |
| | | | | | | | | | | | | | This reverts commit 964cae4f37120db34d0d3e2f08ab998215237dfd. | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Committing the Avination calling card module | Melanie | 2012-03-29 | 1 | -0/+286 |
| | | | | |||||
| | | * | Adding the Avination calling card interface | Melanie | 2012-03-29 | 1 | -0/+13 |
| | | | | |||||
| | | * | Pushing the Avination Calling card hooks. Module to follow. | Melanie | 2012-03-29 | 1 | -4/+17 |
| | | | | |||||
| | * | | Committing the Avination calling card module | Melanie | 2012-03-28 | 1 | -0/+286 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 20 | -85/+471 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |