| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | If an AddItem fails, try adding it to the right folder type. | Diva Canto | 2012-04-06 | 1 | -20/+63 | |
| | |/ | ||||||
| * | | minor changes.. a few physicsactor -> pa and a use a constant with |'ed ↵ | UbitUmarov | 2012-04-04 | 1 | -35/+31 | |
| | | | | | | | | | bit fields in place of 6 individual checks ||'ed | |||||
| * | | remove more merge artefacts | UbitUmarov | 2012-04-04 | 1 | -10/+3 | |
| | | | ||||||
| * | | 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). | |||||
| * | | 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 | 4 | -107/+201 | |
| |\ \ | |/ | | | | | | | | | | | | | 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 | |||||
| | * | Eliminate race condition where many callers would check SOP.PhysicsActor != ↵ | Justin Clark-Casey (justincc) | 2012-04-03 | 4 | -150/+204 | |
| | | | | | | | | | | | | | | | | | 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' into careminster | Melanie | 2012-03-31 | 7 | -65/+138 | |
| |\ \ | |/ | | | | | | | | | | | | | 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 | 5 | -29/+29 | |
| | | | | | | | | | the 'root' part. | |||||
| | * | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -32/+21 | |
| | | | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned. | |||||
| | * | minor: small message adjustment and unnecessary code elimination when ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -1/+1 | |
| | | | | | | | | | notifying client of no build permission | |||||
| | * | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932 | PixelTomsen | 2012-03-31 | 1 | -1/+7 | |
| | | | ||||||
| | * | refactor: Move "friends show cache" console command out into separate ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -4/+21 | |
| | | | | | | | | | | | | | 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 | 1 | -2/+22 | |
| | | | | | | | | | | | | | | | 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-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 | 2 | -1/+6 | |
| | |/ | | | | | | | | | | | | | 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 | 1 | -0/+13 | |
| | | | | | | | | | Also ass OpenSource header | |||||
| | * | Revert "Simplify friends caching by only doing this for root agents - no ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 2 | -3/+1 | |
| | | | | | | | | | | | | | | | | | 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 | 3 | -17/+6 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| | * | Add comment about setting client.SceneAgent in AddNewClient() | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -0/+3 | |
| | | | ||||||
| | * | Simplify friends caching by only doing this for root agents - no functions ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting. | |||||
| | * | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵ | Diva Canto | 2012-03-28 | 1 | -16/+0 | |
| | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -15/+18 | |
| |\ \ | |/ | ||||||
| | * | More on switching the root folder from under the viewer. More experiments. | Diva Canto | 2012-03-27 | 2 | -15/+18 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -4/+26 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 1 | -0/+15 | |
| | |\ | ||||||
| | | * | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | |||||
| | * | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵ | Diva Canto | 2012-03-27 | 1 | -4/+11 | |
| | |/ | | | | | | | guarded by an obscure config that no one but me should be using at this point. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+10 | |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||||
| | * | minor: Add some documentation to OnNewClient and OnClientClosed events | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+10 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -1/+3 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | Two new scripting functions osInviteToGroup(userID) and ↵ | Snoopy Pfeffer | 2012-03-27 | 1 | -0/+2 | |
| | | | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups. | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-27 | 24 | -593/+818 | |
| | |\ | ||||||
| | * | | When loading objects from DB, first add to scene, then call ↵ | Dan Lake | 2012-03-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | TriggerOnSceneObjectLoaded. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -0/+8 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | HG: beginning of a more restrictive inventory access procedure (optional). ↵ | Diva Canto | 2012-03-27 | 1 | -0/+8 | |
| | | | | | | | | | | | | | Experimental: we'll try switching the root folder from under the viewer. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -0/+2 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add some more overloads to allow registering overloaded methods and lists | Melanie | 2012-03-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | | of methods. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -1/+1 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | |||||
| | * | | Add a hust UUID to the script invocations | Melanie | 2012-03-26 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix the omission on the interface declaration | Melanie | 2012-03-26 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 1 | -4/+3 | |
| | | | | | | | | | | | | | be. | |||||
| * | | | Fix the omission on the interface declaration | Melanie | 2012-03-26 | 1 | -1/+1 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |